From: hgn <hgodden00@gmail.com>
Date: Tue, 21 Dec 2021 11:02:16 +0000 (+0000)
Subject: publish build
X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=commitdiff_plain;h=5299d3ec447aadc2becebdcd4c494541d8012b6d

publish build
---

diff --git a/fishladder.c b/fishladder.c
index 9a567df..81c2b82 100644
--- a/fishladder.c
+++ b/fishladder.c
@@ -1,6 +1,6 @@
 // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
 
-//#define VG_CAPTURE_MODE
+#define VG_CAPTURE_MODE
 #define VG_STEAM
 #define VG_STEAM_APPID 1218140U
 #include "vg/vg.h"
@@ -142,7 +142,8 @@ struct
 		title_start, title_count,
 		desc_start, desc_count,
 		score_start, score_count,
-		time_start, time_count
+		time_start, time_count,
+		grid_start, grid_count
 	;
 	
 	#pragma pack(push,1)
@@ -518,13 +519,15 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin,
 	invUv[0] = 1.0f / (float)font->width;
 	invUv[1] = 1.0f / (float)font->height;
 	
+	u16 base_idx = start * 4;
+	
 	const char *_c = str;
 	char c;
 	while( (c = *(_c ++)) )
 	{
 		if( c == '\n' )
 		{
-			cursor[1] += size * 1.25f;
+			cursor[1] -= size * 1.25f;
 			cursor[0] = origin[0];
 		}
 		else if( c >= 32 && c <= 126 )
@@ -560,12 +563,12 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin,
 			vt[3].colour = 0xffffffff;
 			
 			// Emit indices
-			ind[0] = count*4;
-			ind[1] = count*4+1;
-			ind[2] = count*4+2;
-			ind[3] = count*4;
-			ind[4] = count*4+2;
-			ind[5] = count*4+3;
+			ind[0] = base_idx+count*4;
+			ind[1] = base_idx+count*4+1;
+			ind[2] = base_idx+count*4+2;
+			ind[3] = base_idx+count*4;
+			ind[4] = base_idx+count*4+2;
+			ind[5] = base_idx+count*4+3;
 			
 			cursor[0] += (float)pch->advance * invScale;
 			count ++;
@@ -582,16 +585,15 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin,
 	);
 	
 	glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo );
-	glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof( u16 ), text_buffers.indices );
+	glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof(u16), text_buffers.indices );
 	
 	return count;
 }
 
 static void gen_level_text( struct cmp_level *pLevel )
 {
-	text_buffers.title_count = gen_text_buffer( pLevel->title, &font_Ubuntu, (v2f){ 0.0f, 0.0f }, 1.0f, text_buffers.title_start );
-	text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ 0.0f, 0.0f }, 0.5f, text_buffers.desc_start );
-	text_buffers.desc_count = 0;
+	text_buffers.title_count = gen_text_buffer( pLevel->title, &font_Ubuntu, (v2f){ -5.0f, -0.6f }, 0.6f, text_buffers.title_start );
+	text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ -5.0, -0.9f }, 0.25f, text_buffers.desc_start );
 }
 
 static int map_load( const char *str, const char *name )
@@ -816,30 +818,20 @@ static int map_load( const char *str, const char *name )
 		
 		// Level selection area
 		
-		// Beginner
-		for( int y = 16+2; y < 16+2+4; y ++ )
-		{
-			u8 *px = &info_buffer[((y*64)+16-1)*4];
-			px[0] = 0x10;
-		}
-		
-		// Intermediate
-		for( int y = 16+2; y < 16+2+6; y ++ )
+		for( int i = 0; i < vg_list_size( button_grids ); i ++ )
 		{
-			for( int x = 0; x < 3; x ++ )
+			struct button_grid *grid = &button_grids[ i ];
+			
+			for( int y = 0; y < grid->dims[1]; y ++ )
 			{
-				u8 *px = &info_buffer[((y*64)+16-5+x)*4];
-				px[0] = 0x10;
+				for( int x = 0; x < grid->dims[0]; x ++ )
+				{
+					u8 *px = &info_buffer[((y+16+grid->origin[1])*64+16+x+grid->origin[0])*4];
+					px[0] = 0x10;
+				}
 			}
 		}
 		
-		// Expert
-		for( int x = 1; x < 5; x ++ )
-		{
-			u8 *px = &info_buffer[((16*64)+16-5+x)*4];
-			px[0] = 0x10;
-		}
-		
 		info_buffer[(((16+world.h-3)*64)+world.w+16-1)*4] = 0x30;
 		info_buffer[(((16+world.h-2)*64)+world.w+16-1)*4] = 0x30;
 
@@ -1091,6 +1083,25 @@ static void career_pass_level( struct cmp_level *lvl, int score, int upload )
 		}
 		
 		if( lvl->unlock ) career_unlock_level( lvl->unlock );
+		
+		if( lvl->achievement )
+		{
+			sw_set_achievement( lvl->achievement );
+		}
+		
+		// Check ALL maps to trigger master engineer
+		for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
+		{
+			struct serializable_set *set = &career_serializable[i];
+			
+			for( int j = 0; j < set->count; j ++ )
+			{
+				if( set->pack[j].completed_score == 0 )
+					return;
+			}
+		}
+		
+		sw_set_achievement( "MASTER_ENGINEER" );
 	}
 }
 
@@ -1107,7 +1118,7 @@ static void career_load(void)
 
 	// Blank save state
 	memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) );	
-	encoded.in_map = -1;
+	encoded.in_map = 0;
 	encoded.levels[0].unlocked = 1;
 	
 	// Load and copy data into encoded
@@ -2197,39 +2208,6 @@ static void level_selection_buttons(void)
 {
 	v3f tutorial_colour = { 0.204f, 0.345f, 0.553f };
 	v3f locked_colour = { 0.2f, 0.2f, 0.2f };
-
-	struct button_grid
-	{
-		v3f primary_colour;
-		v2i origin;
-		v2i dims;
-		struct cmp_level *levels;
-		int count;
-	}
-	grids[] = 
-	{
-		{
-			.primary_colour = { 0.204f, 0.345f, 0.553f },
-			.origin = { -1, 2 },
-			.dims = { 1, 4 },
-			.levels = cmp_levels_tutorials,
-			.count = vg_list_size( cmp_levels_tutorials )
-		},
-		{
-			.primary_colour = { 0.304f, 0.245f, 0.553f },
-			.origin = { -5, 2 },
-			.dims = { 3, 6 },
-			.levels = cmp_levels_basic,
-			.count = vg_list_size( cmp_levels_basic )
-		},
-		{
-			.primary_colour = { 0.553f, 0.345f, 0.204f },
-			.origin = { -4, 0 },
-			.dims = { 4, 1 },
-			.levels = cmp_levels_grad,
-			.count = vg_list_size( cmp_levels_grad )
-		}
-	};
 	
 	v2f tex_coord = { 0.0f, 0.0f };
 	v4f final_colour = { 0.0f, 0.0f, 0.0f, 0.2f };
@@ -2240,9 +2218,9 @@ static void level_selection_buttons(void)
 	if( vg_get_button_down( "primary" ) )
 		select_from = NULL;
 	
-	for( int i = 0; i < vg_list_size( grids ); i ++ )
+	for( int i = 0; i < vg_list_size( button_grids ); i ++ )
 	{
-		struct button_grid *grid = &grids[i];
+		struct button_grid *grid = &button_grids[i];
 		
 		int j = 0;
 		
@@ -2267,7 +2245,11 @@ static void level_selection_buttons(void)
 						else
 							final_colour[3] = 0.2f;
 					}
-					else v3_copy( locked_colour, final_colour );
+					else 
+					{
+						v3_copy( locked_colour, final_colour );
+						final_colour[3] = 0.2f;
+					}
 					
 					v2i_add( grid->origin, (v2i){ x,y }, button_pos );
 					int is_hovering = v2i_eq( (v2i){world.tile_x, world.tile_y}, button_pos );
@@ -2293,7 +2275,12 @@ static void level_selection_buttons(void)
 					}
 					
 					if( world.pCmpLevel == lvl )
-						final_colour[3] += fabsf(sinf( vg_time * 2.0f )) * 0.2f;
+					{
+						final_colour[3] += 0.15f + fabsf(sinf( vg_time * 2.0f )) * 0.05f;
+						
+						if( lvl->completed_score )
+							final_colour[3] += 0.1f;
+					}
 					
 					wbutton_draw( (v2i){ grid->origin[0] + x, grid->origin[1] + y }, tex_coord, final_colour );
 				}
@@ -2529,9 +2516,13 @@ void vg_render(void)
 	vg_tex2d_bind( &tex_ubuntu, 0 );
 	glUniform1i( SHADER_UNIFORM( shader_sdf, "uTexGlyphs" ), 0 );
 	
+	glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f );
 	glDrawElements( GL_TRIANGLES, text_buffers.title_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.title_start*6*sizeof(u16) ) );
 	glDrawElements( GL_TRIANGLES, text_buffers.desc_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.desc_start*6*sizeof(u16) ) );
 	
+	glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 0.17f );
+	glDrawElements( GL_TRIANGLES, text_buffers.grid_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.grid_start*6*sizeof(u16) ) );
+	
 	// WIRES
 	// ========================================================================================================
 	//glDisable(GL_BLEND);
@@ -2781,381 +2772,7 @@ void vg_render(void)
 	*/
 }
 
-static ui_colourset flcol_list_a = {
-	.main = 0xff877979,
-	.hover = 0xffa09393,
-	.active = 0xffbfb1b0
-};
-static ui_colourset flcol_list_b = {
-	.main = 0xff7c6e6e,
-	.hover = 0xffa09393,
-	.active = 0xffbfb1b0
-};
-
-static ui_colourset flcol_list_complete_a = {
-	.main = 0xff62a064,
-	.hover = 0xff8dc18f,
-	.active = 0xffb2ddb3
-};
-
-static ui_colourset flcol_list_complete_b = {
-	.main = 0xff79b37b,
-	.hover = 0xff8dc18f,
-	.active = 0xffb2ddb3
-};
-
-static ui_colourset flcol_list_locked = {
-	.main = 0xff655959,
-	.hover = 0xff655959,
-	.active = 0xff655959
-};
-
-static struct
-{
-	SteamLeaderboard_t steam_leaderboard;
-	int leaderboard_show;
-	
-	struct leaderboard_player
-	{
-		// Internal
-		u64_steamid id;
-		i32 score;
-		int is_local_player;
-		
-		// To be displayed
-		char score_text[ 16 ];
-		char player_name[ 48 ];
-		GLuint texture;			// Not dynamic
-	}
-	leaderboard_players[10];
-	int leaderboard_count;
-	
-	struct
-	{
-		struct cmp_level *level;
-		
-		i32 score;
-		int is_waiting;
-	}
-	upload_request;
-	
-	struct cmp_level *level_selected;
-} 
-ui_data;
-
-void vg_ui(void)
-{
-	/*
-	// UI memory
-	static int pack_selection = 0;
-	static struct pack_info
-	{
-		struct cmp_level *levels;
-		u32 level_count;
-		const char *name;
-	}
-	pack_infos[] = 
-	{
-		{
-			.levels = cmp_levels_tutorials,
-			.level_count = vg_list_size(cmp_levels_tutorials),
-			.name = "Training"
-		},
-		{
-			.levels = cmp_levels_basic,
-			.level_count = vg_list_size(cmp_levels_basic),
-			.name = "Main"
-		},
-		{
-			.levels = cmp_levels_grad,
-			.level_count = vg_list_size(cmp_levels_tutorials),
-			.name = "Expert"
-		}
-	};
-	
-	// UI Code
-	ui_global_ctx.cursor[0] = 0;
-	ui_global_ctx.cursor[1] = 0;
-	ui_global_ctx.cursor[2] = 256;
-
-	gui_fill_y();
-	
-	ui_global_ctx.id_base = 4 << 16;
-	
-	gui_new_node();
-	{
-		gui_capture_mouse( 9999 );
-		gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-		
-		gui_text( "ASSIGNMENTS", 32, 0 );
-		
-		ui_global_ctx.cursor[1] += 30;
-		ui_global_ctx.cursor[3] = 25;
-		
-		gui_new_node();
-		{
-			ui_rect_pad( ui_global_ctx.cursor, 2 );
-			ui_global_ctx.cursor[2] = 84;
-			
-			for( int i = 0; i < 3; i ++ )
-			{
-				int pack_is_unlocked = pack_infos[i].levels[0].unlocked;
-			
-				if( i == pack_selection || !pack_is_unlocked )
-					gui_override_colours( &flcol_list_locked );
-				
-				if( gui_button( 2000 + i ) == k_button_click && pack_is_unlocked )
-					pack_selection = i;
-				
-				ui_global_ctx.cursor[1] += 2;
-				gui_text( pack_is_unlocked? pack_infos[i].name: "???", 24, 0 );
-				gui_end_right();
-				
-				gui_reset_colours();
-			} 
-		}
-		gui_end_down();
-		
-		ui_global_ctx.cursor[3] = 500;
-		
-		// DRAW LEVEL SELECTION LIST
-		{
-			struct cmp_level *levels = pack_infos[ pack_selection ].levels;
-			int count = pack_infos[ pack_selection ].level_count;
-
-			static struct ui_scrollbar sb = {
-				.bar_height = 400
-			};
-			
-			ui_px view_height = ui_global_ctx.cursor[3];
-			ui_px level_height = 50;
-
-			// Level scroll view
-			gui_new_node();
-			{
-				gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-				gui_set_clip( ui_global_ctx.cursor );
-				
-				ui_global_ctx.cursor[2] = 14;
-				gui_align_right();
-				
-				ui_px content_height = count*level_height;
-				if( content_height > view_height )
-				{
-					ui_scrollbar( &ui_global_ctx, &sb, 1 );
-					ui_global_ctx.cursor[1] -= ui_calculate_content_scroll( &sb, content_height );
-				}
-				else
-				{
-					gui_fill_rect( ui_global_ctx.cursor, 0xff807373 );
-				}
-				
-				ui_global_ctx.cursor[2] = 240;
-				ui_global_ctx.cursor[3] = level_height;
-				gui_align_left();
-				
-				for( int i = 0; i < count; i ++ )
-				{
-					struct cmp_level *lvl_info = &levels[i];
-				
-					if( lvl_info->unlocked )
-					{
-						if( lvl_info->completed_score != 0 )
-							gui_override_colours( i&0x1? &flcol_list_complete_a: &flcol_list_complete_b );
-						else
-							gui_override_colours( i&0x1? &flcol_list_a: &flcol_list_b );
-					}
-					else
-						gui_override_colours( &flcol_list_locked );
-					
-					if( lvl_info->unlocked )
-					{
-						if( gui_button( 2 + i ) == k_button_click )
-						{
-							ui_data.level_selected = &levels[i];
-							ui_data.leaderboard_show = 0;
-							
-							if( pack_selection >= 1 )
-								sw_find_leaderboard( ui_data.level_selected->map_name );
-						}
-						
-						ui_global_ctx.override_colour = 0xffffffff;
-						gui_text( lvl_info->title, 24, 0 );
-						ui_global_ctx.cursor[1] += 18;
-						gui_text( lvl_info->completed_score>0? "passed": "incomplete", 24, 0 );
-					}
-					else
-					{
-						gui_button( 2 + i );
-						
-						ui_global_ctx.override_colour = 0xff786f6f;
-						gui_text( "???", 24, 0 );
-						ui_global_ctx.cursor[1] += 18;
-						gui_text( "locked", 24, 0 );
-					}
-					
-					gui_end_down();
-				}
-				
-				gui_reset_colours();		
-				gui_release_clip();
-			}
-			gui_end_down();
-		}
-	}
-	gui_end_right();
-	
-	// Selected level UI
-	// ============================================================
-	
-	if( ui_data.level_selected )
-	{
-		ui_global_ctx.cursor[0] += 16;
-		ui_global_ctx.cursor[1] += 16;
-		ui_global_ctx.cursor[2] = 512-40;
-		ui_global_ctx.cursor[3] = 560-16;
-		
-		gui_new_node();
-		{
-			gui_capture_mouse( 9999 );
-			
-			gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-			ui_global_ctx.cursor[1] += 4;
-			gui_text( ui_data.level_selected->title, 24, 0 );
-			
-			ui_global_ctx.cursor[1] += 30;
-			ui_rect_pad( ui_global_ctx.cursor, 8 );
-			ui_global_ctx.cursor[3] = 300;
-			
-			gui_new_node();
-			{
-				gui_fill_rect( ui_global_ctx.cursor, 0xff655959 );
-			}
-			gui_end_down();
-			
-			//ui_text_use_paragraph( &ui_global_ctx );
-			ui_global_ctx.cursor[1] += 2;
-			
-			gui_text( ui_data.level_selected->description, 16, 0 );
-			//ui_text_use_title( &ui_global_ctx );
-			
-			// Buttons at the bottom
-			ui_global_ctx.cursor[3] = 25;
-			ui_global_ctx.cursor[2] = 80;
-			
-			gui_align_bottom();
-			ui_global_ctx.cursor[1] -= 8;
-			
-			if( gui_button( 3000 ) == k_button_click )
-			{
-				ui_data.level_selected = NULL;
-			}
-			gui_text( "BACK", 24, k_text_alignment_center );
-			gui_end();
-			
-			gui_align_right();
-			ui_global_ctx.cursor[2] = 170;
-			ui_global_ctx.cursor[0] -= 8 + 170 + 2;
-			
-			{
-				gui_override_colours( &flcol_list_locked );
-				if( gui_button( 3001 ) == k_button_click )
-					vg_error( "UNIMPLEMENTED\n" );
-				
-				ui_global_ctx.override_colour = 0xff888888;
-				
-				gui_text( "RESTORE SOLUTION", 24, k_text_alignment_center );
-				gui_end_right();
-				ui_global_ctx.override_colour = 0xffffffff;
-			}
-			
-			ui_global_ctx.cursor[0] += 2;
-			ui_global_ctx.cursor[2] = 80;
-			
-			{
-				gui_override_colours( &flcol_list_complete_a );
-				if( gui_button( 3002 ) == k_button_click )
-				{
-					if( console_changelevel( 1, &ui_data.level_selected->map_name ) )
-					{
-						world.pCmpLevel = ui_data.level_selected;
-
-						ui_data.level_selected = NULL;
-						ui_data.leaderboard_show = 0;
-					}
-				}
-				gui_text( "PLAY", 24, k_text_alignment_center );
-				gui_end();
-			}
-			
-			gui_reset_colours();
-		}
-		gui_end_right();
-		
-		if( ui_data.leaderboard_show )
-		{
-			ui_global_ctx.cursor[0] += 16;
-			ui_global_ctx.cursor[2] = 350;
-			ui_global_ctx.cursor[3] = 25;
-			
-			// If has results
-			gui_new_node();
-			{
-				gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-				gui_text( "FRIEND LEADERBOARD", 24, 0 );
-			}
-			gui_end_down();
-			
-			ui_global_ctx.cursor[1] += 2;
-				
-			gui_new_node();
-			{
-				ui_global_ctx.cursor[3] = 32+8;
-				
-				for( int i = 0; i < ui_data.leaderboard_count; i ++ )
-				{
-					gui_new_node();
-					{
-						gui_fill_rect( ui_global_ctx.cursor, i&0x1? flcol_list_a.main: flcol_list_b.main );
-
-						ui_global_ctx.cursor[0] += 4;
-						ui_global_ctx.cursor[1] += 4;							
-						
-						// 1,2,3 ...
-						static const char *places[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" };
-						gui_text( places[i], 24, 0 );
-						ui_global_ctx.cursor[0] += 32;
-						
-						struct leaderboard_player *player = &ui_data.leaderboard_players[i];
-						
-						// Players image
-						ui_global_ctx.cursor[2] = 32;
-						ui_global_ctx.cursor[3] = 32;
-						
-						gui_new_node();
-						{
-							gui_push_image( ui_global_ctx.cursor, player->texture );
-						}
-						gui_end_right();
-						
-						// Players name
-						gui_text( player->player_name, 24, 0 );
-						
-						ui_global_ctx.cursor[2] = 50;
-						gui_align_right();
-						
-						gui_text( player->score_text, 24, k_text_alignment_right );
-					}
-					gui_end_down();
-					
-					ui_global_ctx.cursor[1] += 2;
-				}
-			}
-			gui_end();
-		}
-	}
-	*/
-}
+void vg_ui(void) {}
 
 void leaderboard_dispatch_score(void)
 {
@@ -3277,6 +2894,8 @@ static int console_credits( int argc, char const *argv[] )
 	vg_info( "  miniaudio    MIT0         miniaud.io\n" );
 	vg_info( "  QOI          MIT          phoboslab.org\n" );
 	vg_info( "  STB library  MIT          nothings.org\n" );
+	vg_info( "  Weiholmir                 JustFredrik\n" );
+	vg_info( "  Ubuntu Regular            ubuntu.com\n" );
 	return 0;
 }
 
@@ -3533,7 +3152,9 @@ void vg_start(void)
 		// Work out the counts for each 'segment'
 		u32 desc_max_size = 0, title_max_size = 0, 
 			score_max_size = 10,
-			time_max_size = 10
+			time_max_size = 10,
+			
+			size_level_texts = 6*9*7
 		;
 		
 		for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
@@ -3553,7 +3174,8 @@ void vg_start(void)
 			title_max_size +
 			desc_max_size +
 			score_max_size +
-			time_max_size;
+			time_max_size +
+			size_level_texts;
 	
 		u32 total_faces = total_characters * 2,
 			total_vertices = total_characters * 4,
@@ -3561,7 +3183,8 @@ void vg_start(void)
 
 		// Working buffer		
 		u32 work_buffer_total_chars = 
-			VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) );
+			VG_MAX( 7, VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) ) );
+			
 		u32 total_work_faces = work_buffer_total_chars * 2,
 			total_work_vertices = work_buffer_total_chars * 4,
 			total_work_indices = total_work_faces * 3;
@@ -3570,12 +3193,14 @@ void vg_start(void)
 		text_buffers.desc_count = 0;
 		text_buffers.score_count = 0;
 		text_buffers.time_count = 0;
+		text_buffers.grid_count = size_level_texts;
 		
 		// Calculate offsets
 		text_buffers.title_start = 0;
-		text_buffers.desc_start = title_max_size;
+		text_buffers.desc_start = text_buffers.title_start + title_max_size;
 		text_buffers.score_start = text_buffers.desc_start + desc_max_size;
 		text_buffers.time_start = text_buffers.score_start + score_max_size;
+		text_buffers.grid_start = text_buffers.time_start + time_max_size;
 	
 		// Opengl
 		glGenVertexArrays(1, &text_buffers.vao);
@@ -3608,6 +3233,32 @@ void vg_start(void)
 		// Offline memory
 		text_buffers.buffer = (struct vector_glyph_vert *)malloc( total_work_vertices * sizeof(struct vector_glyph_vert) );
 		text_buffers.indices = (u16*)malloc( total_work_indices * sizeof(u16) );
+		
+		char label[8];
+		for( int i = 1; i < 7; i ++ )
+			label[i] = ' ';
+		label[7] = 0x00;		
+		
+		// Reset grid
+		for( int x = 0; x < 6; x ++ )
+		{
+			for( int y = 0; y < 9; y ++ )	
+			{
+				label[0] = ' ';
+				
+				if( x == 0 )
+				{
+					if( y != 8 )
+						label[0] = 'A' + y;
+				}
+				else if( y == 8 )
+				{
+					label[0] = '0' + x;
+				}
+				
+				gen_text_buffer( label, &font_Ubuntu, (v2f){ -6.0f + x + (x == 0? 0.6f: 0.2f), y + 0.2f }, 0.35f, text_buffers.grid_start+(y*6+x)*7 );
+			}
+		}
 	}
 	
 	// Restore gamestate
diff --git a/fishladder_resources.h b/fishladder_resources.h
index 431c8d8..bfdf3a2 100644
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -578,21 +578,19 @@ SHADER_DEFINE( shader_sdf,
 	// VERTEX
 	"layout (location=0) in vec2 a_co;"
 	"layout (location=1) in vec2 a_uv;"
-	"layout (location=2) in vec4 a_colour;"
 	"uniform mat3 uPv;"
 	""
 	"out vec2 aTexCoords;"
-	"out vec4 aColour;"
 	""
 	"void main()"
 	"{"
 		"gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );"
 		"aTexCoords = a_uv;"
-		"aColour = a_colour;"
 	"}",
 	
 	// FRAGMENT
 	"uniform sampler2D uTexGlyphs;"
+	"uniform vec4 uColour;"
 	"out vec4 FragColor;"
 	""
 	"in vec2 aTexCoords;"
@@ -601,11 +599,11 @@ SHADER_DEFINE( shader_sdf,
 	"void main()"
 	"{"
 		"vec4 glyph = texture( uTexGlyphs, aTexCoords );"
-		"FragColor = vec4( aColour.rgb, smoothstep( 0.48, 0.52, glyph.r ) * aColour.a );"
+		"FragColor = vec4( uColour.rgb, smoothstep( 0.46, 0.54, glyph.r ) * uColour.a );"
 		//"FragColor = glyph;"
 	"}"
 	,
-	UNIFORMS({ "uPv", "uTexGlyphs" })
+	UNIFORMS({ "uPv", "uTexGlyphs", "uColour" })
 )
 
 void vg_register(void)
@@ -643,6 +641,7 @@ struct cmp_level
 	const char *map_name;
 	const char *title;
 	const char *description;
+	const char *achievement;
 	
 	int unlocked;
 	int completed_score;
@@ -664,7 +663,7 @@ static struct cmp_level cmp_levels_tutorials[] =
 		.title = "PRINCIPLE 1",
 		.map_name = "cmp_t01",
 		.description = 
-			"Utilize basic transport methods",
+			"",
 		
 		._unlock = 1,
 		.is_tutorial = 1
@@ -675,8 +674,7 @@ static struct cmp_level cmp_levels_tutorials[] =
 		.title = "PRINCIPLE 2",
 		.map_name = "cmp_t02",
 		.description = 
-			"Utilize the twisty turny(TM) piece to split the marble\n"
-			"stream into two",
+			"",
 		
 		._unlock = 2,
 		.is_tutorial = 1,
@@ -687,7 +685,7 @@ static struct cmp_level cmp_levels_tutorials[] =
 		.title = "PRINCIPLE 3",
 		.map_name = "cmp_t03",
 		.description = 
-			"Merge transport into one path",
+			"",
 		
 		._unlock = 12,
 		.is_tutorial = 1
@@ -698,11 +696,11 @@ static struct cmp_level cmp_levels_tutorials[] =
 		.title = "PRINCIPLE 4",
 		.map_name = "cmp_t04",
 		.description = 
-			"Some stages require multiple runs to succeed in order to\n" 
-			"pass",
+			"",
 		
 		._unlock = 6,
-		.is_tutorial = 1
+		.is_tutorial = 1,
+		.achievement = "TUTORIALS"
 	}
 };
 
@@ -714,9 +712,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "PATCH",
 		.map_name = "cmp_b04",
 		.description = 
-			"For some reason, the division module our intern built\n"
-			"for us is sending twice as many yellows as needed. Send\n"
-			"the excess to be recycled!",
+			"",
 		
 		._unlock = 7,
 		._linked = 3
@@ -727,8 +723,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "SUBDIVISION 1",
 		.map_name = "cmp_b01",
 		.description = 
-			"Sometimes getting the desired amount takes dividing up\n"
-			"the input and recombining it.",
+			"",
 		
 		._linked = 4,
 		._unlock = 5
@@ -749,8 +744,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "RESTRUCTURE",
 		.map_name = "cmp_b03",
 		.description = 
-			"It is possible to swap these values using simple\n"
-			"division and addition.",
+			"",
 		
 		._unlock = 8
 	},
@@ -760,8 +754,9 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "PATTERNS 1",
 		.map_name = "cmp_b05",
 		.description = 
-			"Replicate the pattern",
+			"",
 		
+		._unlock = 15,
 		._linked = 8
 	},
 	// r2 GM
@@ -770,7 +765,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "PATTERNS 2",
 		.map_name = "cmp_b06",
 		.description = 
-			"Replicate MORE",
+			"",
 		
 		._unlock = 15
 	},
@@ -780,12 +775,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "PRINCIPLE 5",
 		.map_name = "cmp_b10",
 		.description = 
-			"The sharp engineers among you may have already spotted\n" 
-			"and utilized this part of the system\n"
-			"\n"
-			"We forgot to include the relevant principle tasks as\n"
-			"of your training package, you will now be tasked to\n"
-			"complete them",
+			"",
 
 		._unlock = 16,
 		.is_tutorial = 1
@@ -796,8 +786,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "ROUTING PROBLEM",
 		.map_name = "cmp_routing",
 		.description = 
-			"Things can get a little chaotic on tight boards, do your\n"
-			"best to utilize principle 5 to get the job done\n",
+			"",
 		
 		._linked = 9
 	},
@@ -807,10 +796,11 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "MIGHTY CONSUMER",
 		.map_name = "cmp_b07",
 		.description = 
-			"Build a greedy system",
+			"",
 		
 		._linked = 10,
-		._unlock = 11
+		._unlock = 11,
+		.achievement = "MIGHTY_CONSUMER"
 	},
 	{
 		.serial_id = 10,
@@ -827,7 +817,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "REVERSE",
 		.map_name = "cmp_b09",
 		.description = 
-			"Reverse the incoming order. Always length 4",
+			"",
 		
 		._unlock = 17
 	},
@@ -837,14 +827,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.title = "PRINCIPLE 6",
 		.map_name = "cmp_b11",
 		.description =
-			"Usually the splitter piece will flip flop between left\n"
-			"and right, however it can be forced to only rotate in\n"
-			"one direction if trigger wires are attached.\n"
-			"\n"
-			"Right click and drag from a regular block, and attach it\n"
-			"to a splitter. This creates a trigger.\n"
-			"The default state is left, and once a marble hits the\n"
-			"trigger it will switch to rotating that direction.",
+			"(Right click)",
 
 		._unlock = 18,
 		.is_tutorial = 1
@@ -854,9 +837,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.serial_id = 18,
 		.title = "NOT GATE",
 		.map_name = "cmp_not",
-		.description = 
-			"Test your knowledge of triggers, build an 'NOT GATE'\n"
-			"emulated by marble logic.",
+		.description = "",
 		
 		._linked = 19,
 		._unlock = 20
@@ -866,9 +847,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.serial_id = 19,
 		.title = "AND GATE",
 		.map_name = "cmp_and",
-		.description = 
-			"A slightly more complicated gate, but shouldn't be\n"
-			"too difficult for your skillset.",
+		.description = "",
 		
 		._unlock = 20
 	},
@@ -877,11 +856,10 @@ static struct cmp_level cmp_levels_basic[] =
 		.serial_id = 20,
 		.title = "QUALIFICATION PROJECT",
 		.map_name = "cmp_xor",
-		.description =	
-			"Significantly more complicated than an AND or NOT gate,\n"
-			"but possible.",
+		.description =	"",
 
-		._unlock = 13
+		._unlock = 13,
+		.achievement = "GRADUATE"
 	}
 };
 
@@ -892,10 +870,7 @@ static struct cmp_level cmp_levels_grad[] =
 		.serial_id = 13,
 		.title = "SORT",
 		.map_name = "cmp_i01",
-		.description = 
-			"Devise a scheme to filter and sort the inputs. If you\n"
-			"believe you lack the tools required to solve this one,\n"
-			"take a harder look at the inputs.",
+		.description = "",
 		._linked = 14
 		
 	},
@@ -904,10 +879,7 @@ static struct cmp_level cmp_levels_grad[] =
 		.serial_id = 14,
 		.title = "THIRDS",
 		.map_name = "cmp_i02",
-		.description = 
-			"Split the inputs up into a third of their values\n"
-			"\n"
-			"Is this possible? -HG",
+		.description = "",
 		._linked = 21
 		
 	},
@@ -916,9 +888,7 @@ static struct cmp_level cmp_levels_grad[] =
 		.serial_id = 21,
 		.title = "SIMPLE ADDITION",
 		.map_name = "cmp_grad",
-		.description = 
-			"Take the amount of yellows coming in, and add them\n"
-			"together. Send your result using the stream of blues.",
+		.description = "",
 
 		._linked = 22
 	},
@@ -927,8 +897,7 @@ static struct cmp_level cmp_levels_grad[] =
 		.serial_id = 22,
 		.title = "SECRET CODE",
 		.map_name = "cmp_secret",
-		.description = 
-			""
+		.description = ""
 	}
 };
 
@@ -982,3 +951,36 @@ static void career_local_data_init(void)
 		}
 	}
 }
+
+static struct button_grid
+{
+	v3f primary_colour;
+	v2i origin;
+	v2i dims;
+	struct cmp_level *levels;
+	int count;
+}
+button_grids[] = 
+{
+	{
+		.primary_colour = { 0.204f, 0.345f, 0.553f },
+		.origin = { -5, 0 },
+		.dims = { 1, 4 },
+		.levels = cmp_levels_tutorials,
+		.count = vg_list_size( cmp_levels_tutorials )
+	},
+	{
+		.primary_colour = { 0.304f, 0.245f, 0.553f },
+		.origin = { -3, 0 },
+		.dims = { 3, 6 },
+		.levels = cmp_levels_basic,
+		.count = vg_list_size( cmp_levels_basic )
+	},
+	{
+		.primary_colour = { 0.553f, 0.345f, 0.204f },
+		.origin = { -5, 7 },
+		.dims = { 4, 1 },
+		.levels = cmp_levels_grad,
+		.count = vg_list_size( cmp_levels_grad )
+	}
+};