Ver código fonte

Fixed cooldown game logic side and added moar patterns.

Eiyeron Fulmincendii 11 anos atrás
pai
commit
9b59c56ffe
2 arquivos alterados com 75 adições e 14 exclusões
  1. 74 13
      init_states.c
  2. 1 1
      struct.h

+ 74 - 13
init_states.c

@@ -2,32 +2,48 @@
 #include "pattern.h"
 
 const unsigned char patternTest1[] = {
-	0x05,    0x00, 0x20,
+	0x0F,    0x00, 0x60,
 	0x01,    0x00, 0x00,    0x00, 0x05,
 	0x02,    0x00, 0x00,    0x00, 0x05,
 	0x03,    0x00, 0x00,    0x00, 0x05,
 	0x04,    0x00, 0x00,    0x00, 0x05,
 	0x05,    0x00, 0x00,    0x00, 0x05,
 
+	0x04,    0x00, 0x20,    0x00, 0x05,
+	0x05,    0x00, 0x20,    0x00, 0x05,
+	0x00,    0x00, 0x20,    0x00, 0x05,
+	0x01,    0x00, 0x20,    0x00, 0x05,
+	0x02,    0x00, 0x20,    0x00, 0x05,
+
+
+	0x01,    0x00, 0x40,    0x00, 0x05,
+	0x02,    0x00, 0x40,    0x00, 0x05,
+	0x03,    0x00, 0x40,    0x00, 0x05,
+	0x04,    0x00, 0x40,    0x00, 0x05,
+	0x05,    0x00, 0x40,    0x00, 0x05,
 };
 
 const unsigned char patternTest2[] = {
-	0x0C,    0x00, 0x40,
+	0x0F,    0x00, 0x30,
 	0x00,    0x00, 0x00,    0x00, 0x03,
 	0x02,    0x00, 0x00,    0x00, 0x03,
 	0x04,    0x00, 0x00,    0x00, 0x03,
 
+	0x00,    0x00, 0x08,    0x00, 0x03,
+	0x02,    0x00, 0x08,    0x00, 0x03,
+	0x04,    0x00, 0x08,    0x00, 0x03,
+
 	0x00,    0x00, 0x10,    0x00, 0x03,
 	0x02,    0x00, 0x10,    0x00, 0x03,
 	0x04,    0x00, 0x10,    0x00, 0x03,
 
+	0x00,    0x00, 0x18,    0x00, 0x03,
+	0x02,    0x00, 0x18,    0x00, 0x03,
+	0x04,    0x00, 0x18,    0x00, 0x03,
+
 	0x00,    0x00, 0x20,    0x00, 0x03,
 	0x02,    0x00, 0x20,    0x00, 0x03,
 	0x04,    0x00, 0x20,    0x00, 0x03,
-
-	0x00,    0x00, 0x30,    0x00, 0x03,
-	0x02,    0x00, 0x30,    0x00, 0x03,
-	0x04,    0x00, 0x30,    0x00, 0x03,
 };
 
 const unsigned char patternTest3[] = {
@@ -46,9 +62,9 @@ const unsigned char patternTest3[] = {
 };
 
 const unsigned char patternTest4[] = {
-	0x0D,  0x00, 0xB0,
-	0x00,  0x00, 0x00,    0x00, 0x60,
-	0x03,  0x00, 0x00,    0x00, 0x60,
+	0x0D,  0x00, 0x80,
+	0x00,  0x00, 0x00,    0x00, 0x65,
+	0x03,  0x00, 0x00,    0x00, 0x65,
 
 	0x01,  0x00, 0x10,    0x00, 0x02,
 	0x04,  0x00, 0x10,    0x00, 0x02,
@@ -62,9 +78,51 @@ const unsigned char patternTest4[] = {
 
 	0x01,  0x00, 0x50,    0x00, 0x02,
 	0x04,  0x00, 0x50,    0x00, 0x02,
-	0x02,  0x00, 0x60,    0x00, 0x02,
-	0x05,  0x00, 0x60,    0x00, 0x02
+	0x02,  0x00, 0x60,    0x00, 0x05,
+	0x05,  0x00, 0x60,    0x00, 0x05
+
+};
+
+const unsigned char patternTest5[] = {
+	0x04,    0x00, 0x20,
+	0x01,    0x00, 0x00,    0x00, 0x05,
+	0x02,    0x00, 0x00,    0x00, 0x05,
+	0x03,    0x00, 0x00,    0x00, 0x05,
+	0x05,    0x00, 0x00,    0x00, 0x05
+};
+
+const unsigned char patternTest6[] = {
+	0x09,    0x00, 0x40,
+
+	0x00,    0x00, 0x10,    0x00, 0x03,
+	0x02,    0x00, 0x10,    0x00, 0x03,
+	0x04,    0x00, 0x10,    0x00, 0x03,
+
+	0x01,    0x00, 0x20,    0x00, 0x03,
+	0x03,    0x00, 0x20,    0x00, 0x03,
+	0x05,    0x00, 0x20,    0x00, 0x03,
+
+	0x00,    0x00, 0x30,    0x00, 0x03,
+	0x02,    0x00, 0x30,    0x00, 0x03,
+	0x04,    0x00, 0x30,    0x00, 0x03
+};
 
+const unsigned char patternTest7[] = {
+	0x0C,    0x00, 0x70,
+
+	0x01,    0x00, 0x00,    0x00, 0x11,
+	0x02,    0x00, 0x10,    0x00, 0x11,
+	0x03,    0x00, 0x20,    0x00, 0x11,
+	0x04,    0x00, 0x30,    0x00, 0x11,
+	0x05,    0x00, 0x45,    0x00, 0x11,
+	0x00,    0x00, 0x50,    0x00, 0x11,
+
+	0x04,    0x00, 0x00,    0x00, 0x11,
+	0x05,    0x00, 0x10,    0x00, 0x11,
+	0x00,    0x00, 0x20,    0x00, 0x11,
+	0x01,    0x00, 0x30,    0x00, 0x11,
+	0x02,    0x00, 0x40,    0x00, 0x11,
+	0x03,    0x00, 0x50,    0x00, 0x11,
 };
 
 void init_game(Game_Data *data)
@@ -76,12 +134,15 @@ void init_game(Game_Data *data)
 
 	data->level->id = 1;
 
-	data->level->patterns = malloc(4*sizeof(Pattern));
+	data->level->patterns = malloc(7*sizeof(Pattern));
 	readPattern(&data->level->patterns[0], patternTest1);
 	readPattern(&data->level->patterns[1], patternTest2);
 	readPattern(&data->level->patterns[2], patternTest3);
 	readPattern(&data->level->patterns[3], patternTest4);
-	data->level->nb_patterns = 4;
+	readPattern(&data->level->patterns[4], patternTest5);
+	readPattern(&data->level->patterns[5], patternTest6);
+	readPattern(&data->level->patterns[6], patternTest7);
+	data->level->nb_patterns = 7;
 
 	data->level->cam_change_interval = 5;
 	data->level->cam_change_precision = 1;

+ 1 - 1
struct.h

@@ -100,7 +100,7 @@ struct Game_Data{
 
 	unsigned char shift_latch_value;
 	unsigned char alpha_latch_value;
-	unsigned char cooldown_timer;
+	unsigned short cooldown_timer;
 };
 
 struct Pattern{