From 06bfe64baf0bfba5bed3a9237c1b02cc2d5f1764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Arreola=20Rodr=C3=ADguez?= Date: Sun, 6 Oct 2019 23:20:59 -0500 Subject: [PATCH] =?UTF-8?q?Agrego=20florero=20y=20su=20colisi=C3=B3n.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/Makefile.am | 4 +- data/images/fish.png | Bin 0 -> 4339 bytes data/images/fish_dropped.png | Bin 0 -> 3846 bytes data/images/flower.png | Bin 0 -> 5393 bytes data/images/flower_dropped.png | Bin 0 -> 5589 bytes src/beans.c | 131 ++++++++++++++++++++++++++++++--- 6 files changed, 124 insertions(+), 11 deletions(-) create mode 100644 data/images/fish.png create mode 100644 data/images/fish_dropped.png create mode 100644 data/images/flower.png create mode 100644 data/images/flower_dropped.png diff --git a/data/Makefile.am b/data/Makefile.am index 2a26154..cc7fd79 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -128,7 +128,9 @@ nobase_dist_gamedata_DATA = images/background.png \ images/anvil_23.png \ images/oneup.png \ images/fish.png \ - images/fish_dropped.png + images/fish_dropped.png \ + images/flower.png \ + images/flower_dropped.png # Instalar los archivos .desktop e iconos applicationsdir = $(datadir)/applications diff --git a/data/images/fish.png b/data/images/fish.png new file mode 100644 index 0000000000000000000000000000000000000000..fe8825fc308594402942df01ab86797cecfa7a33 GIT binary patch literal 4339 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 literal 0 HcmV?d00001 diff --git a/data/images/fish_dropped.png b/data/images/fish_dropped.png new file mode 100644 index 0000000000000000000000000000000000000000..a4001651b26c4ad595457f4de95ec4dc3bff9984 GIT binary patch literal 3846 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 IM6N<$g4f_%x&QzG literal 0 HcmV?d00001 diff --git a/data/images/flower.png b/data/images/flower.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3d18fba04211f5d316487d1df4440d6bac7ce1 GIT binary patch literal 5393 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 literal 0 HcmV?d00001 diff --git a/data/images/flower_dropped.png b/data/images/flower_dropped.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e9e970d36b8997eaa8659669cdd60b9cf31587 GIT binary patch literal 5589 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 4 && flower_out == FALSE) { + add_bag (7); + flower_out = TRUE; + airbone++; } } } @@ -1132,12 +1192,13 @@ int game_loop (void) { * score = score + (nivel * 2); */ } airbone--; + printf ("Airbone: %i\n", airbone); delete_bag (thisbag); thisbag = nextbag; continue; } } else if (j < 0 && thisbag->bag == 5 && next_level_visible == FALSE) { - i = collider_hittest (colliders_hazard_anvil, anvil_collider_offsets[thisbag->frame][0], anvil_collider_offsets[thisbag->frame][1], colliders[k], penguinx - 120, 251); + i = collider_hittest (colliders_hazard_block, anvil_collider_offsets[thisbag->frame][0], anvil_collider_offsets[thisbag->frame][1], colliders[k], penguinx - 120, 251); if (i == SDL_TRUE) { bags = 7; @@ -1177,10 +1238,10 @@ int game_loop (void) { thisbag = nextbag; continue; } - } else if (thisbag->frame >= 22 && thisbag->frame <= 31 && thisbag->bag == 6 && next_level_visible == FALSE) { - k = thisbag->frame - 22; + } else if (thisbag->bag == 6 && thisbag->frame >= 22 && thisbag->frame <= 31 && next_level_visible == FALSE) { + l = thisbag->frame - 22; - i = collider_hittest (colliders_hazard_fish[k], fish_collider_offests[k][0], fish_collider_offests[k][1], colliders[k], penguinx - 120, 251); + i = collider_hittest (colliders_hazard_fish[l], fish_collider_offsets[l][0], fish_collider_offsets[l][1], colliders[k], penguinx - 120, 251); if (i == SDL_TRUE) { bags = 8; @@ -1202,6 +1263,31 @@ int game_loop (void) { thisbag = nextbag; continue; } + } else if (thisbag->bag == 7 && thisbag->frame >= 18 && thisbag->frame <= 28 && next_level_visible == FALSE) { + l = thisbag->frame - 18; + i = collider_hittest (colliders_hazard_block, flower_collider_offsets[l][0], flower_collider_offsets[l][1], colliders[k], penguinx - 120, 251); + + if (i == SDL_TRUE) { + bags = 9; + + /* TODO: Reproducir el sonido de golpe de florero */ + /* TODO: Acomodar la animación de "Crash" */ + + if (vidas > 0) { + try_visible = TRUE; + animacion = 0; + airbone = 1000; /* El airbone bloquea que salgan más objetos */ + vidas--; + } else { + gameover_visible = TRUE; + } + + flower_out = FALSE; + airbone--; + delete_bag (thisbag); + thisbag = nextbag; + continue; + } } if (thisbag->bag <= 3 && j == 0) { @@ -1215,6 +1301,9 @@ int game_loop (void) { /* Eliminar el pescado del airbone */ airbone--; fish_out = FALSE; + } else if (thisbag->bag == 7 && j == 0) { + airbone--; + flower_out = FALSE; } if (thisbag->bag == 4 && j >= 0) { @@ -1362,6 +1451,25 @@ int game_loop (void) { } else { SDL_BlitSurface (images[i], NULL, screen, &rect); } + } else if (thisbag->bag == 7) { + if (thisbag->frame < thisbag->throw_length) { + i = IMG_FLOWER; + rect.x = thisbag->object_points[thisbag->frame][0]; + rect.y = thisbag->object_points[thisbag->frame][1]; + } else { + i = IMG_FLOWER_DROPPED; + rect.x = thisbag->object_points[31][0]; + rect.y = thisbag->object_points[31][1]; + j = thisbag->frame - thisbag->throw_length; + } + rect.w = images[i]->w; + rect.h = images[i]->h; + + if (i == IMG_FLOWER_DROPPED && j > 25) { + SDL_gfxBlitRGBAWithAlpha (images[i], NULL, screen, &rect, 255 - SDL_ALPHA_OPAQUE * (j - 25) / 10); + } else { + SDL_BlitSurface (images[i], NULL, screen, &rect); + } } thisbag = thisbag->next; @@ -1529,7 +1637,7 @@ void setup (void) { } /* Generar los colliders de bloque */ - colliders_hazard_anvil = collider_new_block (9, 45); + colliders_hazard_block = collider_new_block (9, 45); colliders_hazard_fish[0] = collider_new_block (22, 18); colliders_hazard_fish[1] = collider_new_block (21, 18); @@ -1764,6 +1872,9 @@ void add_bag (int tipo) { } else if (tipo == 6) { new->throw_length = 34; new->object_points = fish_offsets; + } else if (tipo == 7) { + new->throw_length = 31; + new->object_points = flower_offsets; } /* Ahora sus campos para lista doble ligada */