projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
january update version 1.5
[fishladder.git]
/
fishladder_resources.h
diff --git
a/fishladder_resources.h
b/fishladder_resources.h
index a5e3bd6aba281878989f6c0b92209de4bf3e4d8f..ad4c6f3995615b644915ebe23002ef0f1c9db42e 100644
(file)
--- a/
fishladder_resources.h
+++ b/
fishladder_resources.h
@@
-9,7
+9,6
@@
vg_tex2d tex_tiles_min = { .path = "textures/tile_minimal.qoi" };
vg_tex2d tex_tiles_lab = { .path = "textures/tile_lab.qoi" };
vg_tex2d tex_ball_noise = { .path = "textures/bnoise.qoi" };
vg_tex2d tex_tiles_lab = { .path = "textures/tile_lab.qoi" };
vg_tex2d tex_ball_noise = { .path = "textures/bnoise.qoi" };
-vg_tex2d tex_monofur = { .path = "textures/ascii.qoi", .flags = VG_TEXTURE_NO_MIP };
vg_tex2d tex_unkown = { .path = "textures/unkown.qoi" };
vg_tex2d tex_buttons = { .path = "textures/buttons.qoi" };
vg_tex2d tex_sprites = { .path = "textures/autocombine.qoi" };
vg_tex2d tex_unkown = { .path = "textures/unkown.qoi" };
vg_tex2d tex_buttons = { .path = "textures/buttons.qoi" };
vg_tex2d tex_sprites = { .path = "textures/autocombine.qoi" };
@@
-21,7
+20,6
@@
vg_tex2d *texture_list[] = {
&tex_tiles_min,
&tex_tiles_lab,
&tex_ball_noise,
&tex_tiles_min,
&tex_tiles_lab,
&tex_ball_noise,
- &tex_monofur,
&tex_unkown,
&tex_buttons,
&tex_sprites
&tex_unkown,
&tex_buttons,
&tex_sprites
@@
-613,6
+611,7
@@
static struct cmp_level cmp_levels_tutorials[] =
{
26, "cmp_p7", "PRINCIPLE 7", "Emitters",
._unlock = 27,
{
26, "cmp_p7", "PRINCIPLE 7", "Emitters",
._unlock = 27,
+ ._linked = 13,
.is_tutorial = 1
}
};
.is_tutorial = 1
}
};
@@
-635,8
+634,13
@@
static struct cmp_level cmp_levels_basic[] =
},
{
5, "cmp_b03", "RESTRUCTURE", "",
},
{
5, "cmp_b03", "RESTRUCTURE", "",
- ._unlock = 8
+ ._unlock = 8,
+ ._linked = 31
},
},
+ {
+ 31, "cmp_121", "1-2-1", "",
+ ._unlock = 8
+ },
{
7, "cmp_b05", "PATTERNS 1", "",
._unlock = 15,
{
7, "cmp_b05", "PATTERNS 1", "",
._unlock = 15,
@@
-675,7
+679,7
@@
static struct cmp_level cmp_levels_basic[] =
},
{
20, "cmp_xor", "QUALIFICATION PROJECT", "",
},
{
20, "cmp_xor", "QUALIFICATION PROJECT", "",
- ._unlock = 2
5
,
+ ._unlock = 2
6
,
.achievement = "GRADUATE"
},
{
.achievement = "GRADUATE"
},
{
@@
-688,10
+692,15
@@
static struct cmp_level cmp_levels_basic[] =
},
{
29, "cmp_routing2", "ROUTING PROBLEM 2", "Spaghetti!",
},
{
29, "cmp_routing2", "ROUTING PROBLEM 2", "Spaghetti!",
- ._linked = 30
+ ._linked = 30,
+ ._unlock = 32
+ },
+ {
+ 30, "cmp_exact5", "EXACTLY 5", "",
+ ._unlock = 32
},
{
},
{
- 3
0, "cmp_exact5", "EXACTLY 5
", ""
+ 3
2, "cmp_3and2", "THREE AND FOUR
", ""
}
};
}
};
@@
-780,6
+789,7
@@
static struct cmp_level cmp_levels_computer[] =
static struct career_level_pack
{
struct cmp_level *pack;
static struct career_level_pack
{
struct cmp_level *pack;
+ const char *title;
int count;
v3f primary_colour;
int count;
v3f primary_colour;
@@
-790,6
+800,7
@@
career_packs[] =
{
{
.pack = cmp_levels_tutorials,
{
{
.pack = cmp_levels_tutorials,
+ .title = "",
.count = vg_list_size( cmp_levels_tutorials ),
.primary_colour = { 0.204f, 0.345f, 0.553f },
.origin = { -5, -2 },
.count = vg_list_size( cmp_levels_tutorials ),
.primary_colour = { 0.204f, 0.345f, 0.553f },
.origin = { -5, -2 },
@@
-797,6
+808,7
@@
career_packs[] =
},
{
.pack = cmp_levels_basic,
},
{
.pack = cmp_levels_basic,
+ .title = "\x8C\x8D"" Core",
.count = vg_list_size( cmp_levels_basic ),
.primary_colour = { 0.304f, 0.245f, 0.553f },
.origin = { -3, -2 },
.count = vg_list_size( cmp_levels_basic ),
.primary_colour = { 0.304f, 0.245f, 0.553f },
.origin = { -3, -2 },
@@
-804,6
+816,7
@@
career_packs[] =
},
{
.pack = cmp_levels_grad,
},
{
.pack = cmp_levels_grad,
+ .title = "\x8C\x8E"" Challenge",
.count = vg_list_size( cmp_levels_grad ),
.primary_colour = { 0.553f, 0.345f, 0.204f },
.origin = { -5, 6 },
.count = vg_list_size( cmp_levels_grad ),
.primary_colour = { 0.553f, 0.345f, 0.204f },
.origin = { -5, 6 },
@@
-811,6
+824,7
@@
career_packs[] =
},
{
.pack = cmp_levels_computer,
},
{
.pack = cmp_levels_computer,
+ .title = "\x8C\x8F"" 3 Bit computer\n\n (preview)",
.count = vg_list_size( cmp_levels_computer ),
.primary_colour = { 0.75f, 0.23f, 0.39f },
.origin = { -5, 8 },
.count = vg_list_size( cmp_levels_computer ),
.primary_colour = { 0.75f, 0.23f, 0.39f },
.origin = { -5, 8 },