From: hgn <hgodden00@gmail.com>
Date: Sun, 23 Jan 2022 22:15:13 +0000 (+0000)
Subject: new map, different light colours
X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=commitdiff_plain;h=33a1521384fd26924a3bf9647ba7542148295642

new map, different light colours
---

diff --git a/fishladder.c b/fishladder.c
index 493b704..22438c9 100644
--- a/fishladder.c
+++ b/fishladder.c
@@ -668,6 +668,9 @@ static void gen_level_text( struct cmp_level *pLevel )
       }
    }
 
+   // re-create level scores
+   
+
    ui_resolve( &world.st.world_text );
 }
 
@@ -3149,11 +3152,16 @@ void vg_render(void)
 
 			v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
 			v2_add( center, (v2f){  0.25f, -0.25f }, p1 );
-
-			if( cell->state & FLAG_FLIP_FLOP )
-				render_sprite( k_sprite_flare_y, p1 );
-			else
-				render_sprite( k_sprite_flare_b, p0 );
+         
+         if( cell->state & FLAG_TARGETED )
+         {
+			   if( cell->state & FLAG_FLIP_FLOP )
+			   	render_sprite( k_sprite_flare_y, p1 );
+			   else
+				   render_sprite( k_sprite_flare_b, p0 );
+         }
+         else
+            render_sprite( k_sprite_flare_w, cell->state &FLAG_FLIP_FLOP? p1: p0 );
 		}
 	}
 
diff --git a/fishladder_resources.h b/fishladder_resources.h
index a3a2a87..9030301 100644
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -634,7 +634,15 @@ static struct cmp_level cmp_levels_tutorials[] =
 
 		._unlock = 18,
 		.is_tutorial = 1
-	}
+	},
+   {
+      .serial_id = 25,
+      .title = "PRINCIPLE 7",
+      .map_name = "cmp_p7",
+      .description = "Emitters",
+      ._unlock = 26,
+      .is_tutorial = 1
+   }
 };
 
 static struct cmp_level cmp_levels_basic[] =
@@ -757,7 +765,7 @@ static struct cmp_level cmp_levels_basic[] =
 		.map_name = "cmp_xor",
 		.description =	"",
 
-		._unlock = 13,
+		._unlock = 25,
 		.achievement = "GRADUATE"
 	}
 };
@@ -807,7 +815,23 @@ static struct cmp_level cmp_levels_computer[] =
 		.serial_id = 23,
 		.title = "3 BIT BINARY",
 		.map_name = "cmp_binary",
-		.description = "",
+		.description = "convert amount to binary",
+      .strings =
+      {
+         {
+            .placement = k_placement_bottom,
+            .str = 
+"\t\t\t\t\t\t\t\t\t\t\x83                   \x84\n"
+"\t\t\t\t\t\t\t\t\t\t\x83                   \x84 Binary\n"
+"\t\t\t\t\t\t\t\t\t\t\x83 4       2       1 \x84"
+         },
+         {
+            .placement = k_placement_top,
+            .str =
+"\n"
+"\t\t\t\t\t\t\t\t\t\t\t Count"
+         }
+      },
 		
 		._unlock = 24
 	},
@@ -841,7 +865,18 @@ static struct cmp_level cmp_levels_computer[] =
 		.serial_id = 25,
 		.title = "3x3 PLOT",
 		.map_name = "cmp_plot3x3",
-		.description = ""
+		.description = "2 bit x/y",
+
+      .strings =
+      {
+         {
+            .placement = k_placement_top,
+            .str=
+"\t\t\t\t\t\t\t\t\x8A 2       1 \x8B           \x8A 2       1 \x8B\n"
+"\t\t\t\t\t\t\t\t\x83           \x84 X       Y \x83           \x84\n"
+"\t\t\t\t\t\t\t\t\x83           \x84           \x83           \x84"
+         }
+      }
 	}
 };
 
diff --git a/maps/cmp_binary.map b/maps/cmp_binary.map
index a474378..9966653 100644
--- a/maps/cmp_binary.map
+++ b/maps/cmp_binary.map
@@ -1,5 +1,5 @@
 #####################;
-########-#-#-########;a:a::,:a:a:a,:::a
+##########-.-.-######;a:a::,:a:a:a,:::a
 ##                 ##;
 ##                 ##;
 ##                 ##;
diff --git a/maps/cmp_p7.map b/maps/cmp_p7.map
new file mode 100644
index 0000000..ef8292e
--- /dev/null
+++ b/maps/cmp_p7.map
@@ -0,0 +1,9 @@
+########;
+##-#####;db
+##    ##;
+##### ##;
+### # ##;
+### # ##;
+### # ##;
+###+#*##;a,bd
+########;
diff --git a/maps/cmp_plot3x3.map b/maps/cmp_plot3x3.map
index cfb4d01..3ce83b9 100644
--- a/maps/cmp_plot3x3.map
+++ b/maps/cmp_plot3x3.map
@@ -21,5 +21,5 @@
 ##                 ##;
 ##                 ##;
 ###               ###;
-####+###+#+###+#+####;b:b:b:b:b:b,:a::::,a:::a:a:,::a::a:,a:::::
+####+###+.+###+.+####;b:b:b:b:b:b,:a::::,a:::a:a:,::a::a:,a:::::
 #####################;
diff --git a/sprites_autocombine.h b/sprites_autocombine.h
index 8092788..44a163a 100644
--- a/sprites_autocombine.h
+++ b/sprites_autocombine.h
@@ -5,6 +5,7 @@ enum sprites_auto_combine_index
 	k_sprite_brk_r,
 	k_sprite_brk_u,
 	k_sprite_flare_b,
+	k_sprite_flare_w,
 	k_sprite_flare_y,
 	k_sprite_jack_1,
 	k_sprite_jack_2,
@@ -19,7 +20,8 @@ static struct vg_sprite sprites_auto_combine[] =
 	{{ 0.468750, 0.000000, 0.156250, 0.156250 }},
 	{{ 0.625000, 0.000000, 0.125000, 0.125000 }},
 	{{ 0.750000, 0.000000, 0.125000, 0.125000 }},
-	{{ 0.875000, 0.000000, 0.062500, 0.062500 }},
-	{{ 0.937500, 0.000000, 0.062500, 0.062500 }},
-	{{ 0.875000, 0.062500, 0.062500, 0.062500 }}
+	{{ 0.875000, 0.000000, 0.125000, 0.125000 }},
+	{{ 0.000000, 0.156250, 0.062500, 0.062500 }},
+	{{ 0.062500, 0.156250, 0.062500, 0.062500 }},
+	{{ 0.125000, 0.156250, 0.062500, 0.062500 }}
 };
\ No newline at end of file
diff --git a/textures_combine/flare_w.png b/textures_combine/flare_w.png
new file mode 100644
index 0000000..0cc28f1
Binary files /dev/null and b/textures_combine/flare_w.png differ