fixed state resetting
[fishladder.git] / fishladder_resources.h
index 1a56f549739cf6512013423898378cc2b32533e5..30b4dc9609e3af70754233636234e8556ee19afa 100644 (file)
@@ -64,6 +64,14 @@ sound/random_07.ogg\0\
 sound/random_08.ogg\0"
 };
 
+sfx_set audio_clicks =
+{
+ .sources = "\
+sound/click_a.ogg\0\
+sound/click_b.ogg\0\
+sound/click_c.ogg\0"
+};
+
 // One two or three layers of rolling noise
 sfx_system audio_system_balls_rolling =
 {
@@ -92,6 +100,12 @@ sfx_system audio_system_balls_extra =
        .name = "Balls Extra"
 };
 
+sfx_system audio_system_ui = 
+{
+       .vol = 1.f, .ch = 1, .vol_src = &audio_volume_sfx,
+       .name = "UI"
+};
+
 ui_colourset ui_fl_colours = {
        .main = 0xff807373,
        .hover = 0xff918484,
@@ -119,6 +133,7 @@ static void resource_load_main(void)
        sfx_set_init( &audio_splitter, NULL );
        sfx_set_init( &audio_rolls, NULL );
        sfx_set_init( &audio_random, NULL );
+       sfx_set_init( &audio_clicks, NULL );
 }
 
 static void resource_free_main(void)
@@ -129,6 +144,7 @@ static void resource_free_main(void)
        sfx_set_free( &audio_splitter );
        sfx_set_free( &audio_rolls );
        sfx_set_free( &audio_random );
+       sfx_set_free( &audio_clicks );
 }
 
 // SHADERS
@@ -369,15 +385,26 @@ SHADER_DEFINE( shader_wire,
        ""
        "uniform sampler2D uTexMain;"
        "uniform vec4 uColour;"
+       "uniform float uTime;"
+       "uniform float uGlow;"
        ""
        "in vec2 aTexCoords;"
        ""
        "void main()"
        "{"
-               "FragColor = uColour;"
+               // Compute shadowing
+               "float shadow = 1.0 - abs(aTexCoords.y - 0.5) * 2.0;"
+               "float masking = smoothstep( 0.5, 0.8, shadow );"
+               
+               "vec3 colour_comp = mix( vec3(0.0,0.0,0.0), uColour.rgb, masking );"
+               
+               "float flow_thing = fract( aTexCoords.x + uTime );"
+               "vec3 final_comp = colour_comp + flow_thing * uGlow;"
+               
+               "FragColor = vec4( final_comp, max( shadow* 0.2, masking ) * uColour.a );"
        "}"
        ,
-       UNIFORMS({ "uPv", "uColour", "uTexMain", "uStart", "uEnd", "uCurve" })
+       UNIFORMS({ "uPv", "uColour", "uTexMain", "uStart", "uEnd", "uCurve", "uTime", "uGlow" })
 )
 
 SHADER_DEFINE( shader_buttons,
@@ -624,7 +651,8 @@ static struct cmp_level cmp_levels_tutorials[] =
                .serial_id = 0,
                .title = "PRINCIPLE 1",
                .map_name = "cmp_t01",
-               .description = "Utilize basic transport methods",
+               .description = 
+                       "Utilize basic transport methods",
                
                ._unlock = 1,
                .is_tutorial = 1
@@ -634,8 +662,9 @@ static struct cmp_level cmp_levels_tutorials[] =
                .serial_id = 1,
                .title = "PRINCIPLE 2",
                .map_name = "cmp_t02",
-               .description = "Utilize the twisty turny(TM) piece to split\n"
-                                                       "the marble stream into two",
+               .description = 
+                       "Utilize the twisty turny(TM) piece to split the marble\n"
+                       "stream into two",
                
                ._unlock = 2,
                .is_tutorial = 1,
@@ -645,7 +674,8 @@ static struct cmp_level cmp_levels_tutorials[] =
                .serial_id = 2,
                .title = "PRINCIPLE 3",
                .map_name = "cmp_t03",
-               .description = "Merge transport into one",
+               .description = 
+                       "Merge transport into one",
                
                ._unlock = 12,
                .is_tutorial = 1
@@ -655,8 +685,9 @@ static struct cmp_level cmp_levels_tutorials[] =
                .serial_id = 12,
                .title = "PRINCIPLE 4",
                .map_name = "cmp_t04",
-               .description = "Some stages require multiple runs to succeed\n" 
-                                                       "in order to pass",
+               .description = 
+                       "Some stages require multiple runs to succeed in order to\n" 
+                       "pass",
                
                ._unlock = 3,
                .is_tutorial = 1
@@ -665,87 +696,73 @@ static struct cmp_level cmp_levels_tutorials[] =
 
 static struct cmp_level cmp_levels_basic[] =
 {
-       // r1
+       // r2 GM
+       {
+               .serial_id = 6,
+               .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
+       },
+       // r1 GM
        {
                .serial_id = 3,
                .title = "SUBDIVISION 1",
                .map_name = "cmp_b01",
-               .description = "Sometimes getting the desired amount takes\n"
-                                                       "dividing up the input and recombining it.",
+               .description = 
+                       "Sometimes getting the desired amount takes dividing up\n"
+                       "the input and recombining it.",
                
                ._linked = 4,
-               ._unlock = 6
+               ._unlock = 5
        },
-       // r1
+       // r1 GM
        {
                .serial_id = 4,
                .title = "SUBDIVISION 2",
                .map_name = "cmp_b02",
-               .description = "",
+               .description = 
+                       "",
                
-               ._linked = 5,
                ._unlock = 7
        },
-       // r1
+       // r1 GM
        {
                .serial_id = 5,
                .title = "RESTRUCTURE",
                .map_name = "cmp_b03",
-               .description = "It is possible to swap these values using\n"
-                                                       "simple division and addition.",
+               .description = 
+                       "It is possible to swap these values using simple\n"
+                       "division and addition.",
                
                ._unlock = 8
        },
-       {
-               .serial_id = 6,
-               .title = "SERIALIZE",
-               .map_name = "cmp_b04",
-               .description = "Merge and sort",
-               
-               ._unlock = 7
-       },
+       // r2 GM
        {
                .serial_id = 7,
                .title = "PATTERNS 1",
                .map_name = "cmp_b05",
-               .description = "Replicate",
+               .description = 
+                       "Replicate",
                
                ._linked = 8
        },
+       // r2 GM
        {
                .serial_id = 8,
                .title = "PATTERNS 2",
                .map_name = "cmp_b06",
-               .description = "Replicate MORE",
-               
-               ._unlock = 9
-       },
-       {
-               .serial_id = 9,
-               .title = "MIGHTY CONSUMER",
-               .map_name = "cmp_b07",
-               .description = "Build a greedy system",
-               
-               ._linked = 10,
-               ._unlock = 11
-       },
-       {
-               .serial_id = 10,
-               .title = "ENCRYPTED 1",
-               .map_name = "cmp_b08",
-               .description = "Some configurations may not be valid",
-
-               ._unlock = 15
-       },
-       {
-               .serial_id = 11,
-               .title = "REVERSE",
-               .map_name = "cmp_b09",
-               .description = "Reverse the incoming order. Always length 4",
+               .description = 
+                       "Replicate MORE",
                
                ._unlock = 15
        },
-       // r2
+       // r2 GM
        {
                .serial_id = 15,
                .title = "PRINCIPLE 5",
@@ -761,7 +778,7 @@ static struct cmp_level cmp_levels_basic[] =
                ._unlock = 16,
                .is_tutorial = 1
        },
-       // r2
+       // r2 GM
        {
                .serial_id = 16,
                .title = "ROUTING PROBLEM",
@@ -770,33 +787,57 @@ static struct cmp_level cmp_levels_basic[] =
                        "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
+       },
+       // r2 GM
+       {
+               .serial_id = 9,
+               .title = "MIGHTY CONSUMER",
+               .map_name = "cmp_b07",
+               .description = 
+                       "Build a greedy system",
+               
+               ._linked = 10,
+               ._unlock = 11
+       },
+       {
+               .serial_id = 10,
+               .title = "SHIFT",
+               .map_name = "cmp_b08",
+               .description = 
+                       "",
+
+               ._unlock = 17
+       },
+       // r2 GM
+       {
+               .serial_id = 11,
+               .title = "REVERSE",
+               .map_name = "cmp_b09",
+               .description = 
+                       "Reverse the incoming order. Always length 4",
+               
                ._unlock = 17
        },
+       // r2 GM
        {
                .serial_id = 17,
                .title = "PRINCIPLE 6",
                .map_name = "cmp_b11",
                .description =
-                       "While hovering over a simple tile peice, right click and\n"
-                       "drag to start creating a wire. These can be connected to\n"
-                       "the left, or right recieving pins of a Twisty Turny(TM).\n"
-                       "\n"
-                       "Once connected, the Twisty Turny(TM) will no longer\n"
-                       "'flip flop' as marbles run through them, but instead be\n"
-                       "et to left or right rotating only. As indicated by the\n"
-                       "status arrow beneath them\n"
-                       "\n"
-                       "When the left or right slot is triggered, the Twisty\n"
-                       "Turny(TM) will switch modes according to that input.\n"
+                       "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"
-                       "Trigger wires apply instantaneously, however if both the\n"
-                       "left and right inputs are recieved at the same time,\n"
-                       "this results in no operation being performed, and no\n"
-                       "state changes take place in the Twisty Turny(TM)\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.",
 
                ._unlock = 18,
                .is_tutorial = 1
        },
+       // r2 GM
        {
                .serial_id = 18,
                .title = "NOT GATE",
@@ -808,6 +849,7 @@ static struct cmp_level cmp_levels_basic[] =
                ._linked = 19,
                ._unlock = 20
        },
+       // r2 GM
        {
                .serial_id = 19,
                .title = "AND GATE",
@@ -818,19 +860,22 @@ static struct cmp_level cmp_levels_basic[] =
                
                ._unlock = 20
        },
+       // r2 GM
        {
                .serial_id = 20,
                .title = "QUALIFICATION PROJECT",
-               .map_name = "cmp_grad",
-               .description =
-                       "There's no instructions here, resolve and complete this\n"
-                       "task to qualify yourself as an official marble engineer",
+               .map_name = "cmp_xor",
+               .description =  
+                       "Significantly more complicated than an AND or NOT gate,\n"
+                       "but possible.",
+
                ._unlock = 13
        }
 };
 
 static struct cmp_level cmp_levels_grad[] =
 {
+       // r2
        {
                .serial_id = 13,
                .title = "SORT",
@@ -842,6 +887,7 @@ static struct cmp_level cmp_levels_grad[] =
                ._linked = 14
                
        },
+       // r2
        {
                .serial_id = 14,
                .title = "THIRDS",
@@ -853,36 +899,29 @@ static struct cmp_level cmp_levels_grad[] =
                ._linked = 21
                
        },
+       // r2 GM
        {
                .serial_id = 21,
-               .title = "XOR CHIP",
-               .map_name = "cmp_xor",
+               .title = "SIMPLE ADDITION",
+               .map_name = "cmp_grad",
                .description = 
-                       "Significantly more complicated than an AND or NOT gate,\n"
-                       "but possible.",
+                       "Take the amount of yellows coming in, and add them\n"
+                       "together. Send your result using the stream of blues.",
+
                ._linked = 22
        },
+       // r2 GM
        {
                .serial_id = 22,
                .title = "SECRET CODE",
                .map_name = "cmp_secret",
                .description = 
-                       "Only one input should send an unlock signal marble to\n"
-                       "the output.\n"
-                       "The code: 100110"
+                       ""
        }
 };
 
 #define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad ))
 
-/*
-static struct
-{
-}
-career_local = 
-{
-};*/
-
 static struct serializable_set 
 {
        struct cmp_level *pack;