Compare commits

...

3 commits

Author SHA1 Message Date
f85084ca20 new screenshots 2022-11-25 13:24:12 -05:00
3a904903e7 more snappy screen transitions 2022-11-25 12:48:31 -05:00
f2d4ce2f35 changed feather colors 2022-11-25 12:38:24 -05:00
7 changed files with 17 additions and 32 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

@ -30,12 +30,11 @@ Sound fxfeather = { 0 };
Sound fxboom = { 0 }; Sound fxboom = { 0 };
bool pause; bool pause;
bool DebugMode; bool DebugMode;
int ammo = 0;
int fireworkAmount = 0; int fireworkAmount = 0;
int GI_callcount = 0; int GI_callcount = 0;
//int trigMov; //int trigMov;
int score = 0, bestscore = 0, finishfromGameplayScreen = 0, redfeathers = 0, greenfeathers = 0; int score = 0, bestscore = 0, finishfromGameplayScreen = 0, greenfeathers = 0;
Music Gameplaysong = { 0 }; Music Gameplaysong = { 0 };
@ -50,12 +49,12 @@ void LoadGamplayScreen(void)
feather_sprite = LoadTexture("assets/gfx/feather.png"); feather_sprite = LoadTexture("assets/gfx/feather.png");
attack_sprite = LoadTexture("assets/gfx/attack.png"); attack_sprite = LoadTexture("assets/gfx/attack.png");
firework_sprite = LoadTexture("assets/gfx/firework.png"); firework_sprite = LoadTexture("assets/gfx/firework.png");
Gameplaysong = LoadMusicStream("assets/bgm/03-Boss.ogg"); // Gameplaysong = LoadMusicStream("assets/bgm/03-Boss.ogg");
} }
void InitGameplayScreen(void) void InitGameplayScreen(void)
{ {
PlayMusicStream(Gameplaysong); // PlayMusicStream(Gameplaysong);
finishfromGameplayScreen = 0; finishfromGameplayScreen = 0;
@ -64,7 +63,6 @@ void InitGameplayScreen(void)
globalTimer = 0; globalTimer = 0;
if (player.hp < 1) player.hp = 1; if (player.hp < 1) player.hp = 1;
//if (ammo < 60) ammo = 60;
player.currentframe = 0; player.currentframe = 0;
player.speed = 300.0f; player.speed = 300.0f;
@ -144,7 +142,7 @@ void InitGameplayScreen(void)
shoot[i].speed.x = 5000.f; shoot[i].speed.x = 5000.f;
shoot[i].speed.y = 0; shoot[i].speed.y = 0;
shoot[i].active = false; shoot[i].active = false;
shoot[i].color = RED; shoot[i].color = GREEN;
} }
switch (level) { switch (level) {
case LEVEL1: fireworkAmount = 100; break; case LEVEL1: fireworkAmount = 100; break;
@ -182,7 +180,7 @@ void UpdateGameplayScreen(void)
finishfromGameplayScreen = 3; finishfromGameplayScreen = 3;
} }
if (!mute) UpdateMusicStream(Gameplaysong); // if (!mute) UpdateMusicStream(Gameplaysong);
if (!pause) { if (!pause) {
@ -196,17 +194,14 @@ void UpdateGameplayScreen(void)
if (player.currentframe != 1) player.currentframe = 2; if (player.currentframe != 1) player.currentframe = 2;
} else player.speed = 300.0f; } else player.speed = 300.0f;
if (INPUT_FIRE_DOWN) { if (INPUT_FIRE_DOWN) {
// if (ammo > 0) {
for (int i = 0; i < MAX_SHOOTS; i++) { for (int i = 0; i < MAX_SHOOTS; i++) {
if (!shoot[i].active) { if (!shoot[i].active) {
ammo++;
shoot[i].hitbox.x = player.hitbox.x; shoot[i].hitbox.x = player.hitbox.x;
shoot[i].hitbox.y = player.hitbox.y + player.hitbox.height/4; shoot[i].hitbox.y = player.hitbox.y + player.hitbox.height/4;
shoot[i].active = true; shoot[i].active = true;
break; break;
} }
} }
// }
} }
// Update sprite positions // Update sprite positions
player.sprite_pos = (Vector2){ player.hitbox.x, player.hitbox.y }; player.sprite_pos = (Vector2){ player.hitbox.x, player.hitbox.y };
@ -238,12 +233,9 @@ void UpdateGameplayScreen(void)
UpdateiFrameTimer(&player); UpdateiFrameTimer(&player);
// UpdateiFrameTimer(&enemy); // UpdateiFrameTimer(&enemy);
greenfeathers = player.hp; greenfeathers = player.hp;
redfeathers = ammo;
// Debug stuff // Debug stuff
if (IsKeyPressed(KEY_D)) DebugMode = !DebugMode; if (IsKeyPressed(KEY_D)) DebugMode = !DebugMode;
if (IsKeyPressed(KEY_NINE)) ammo = 99;
if (IsKeyPressed(KEY_ZERO)) ammo = 0;
if (IsKeyPressed(KEY_G)) finishfromGameplayScreen = 1; if (IsKeyPressed(KEY_G)) finishfromGameplayScreen = 1;
if (IsKeyPressed(KEY_Q)) finishfromGameplayScreen = 4; if (IsKeyPressed(KEY_Q)) finishfromGameplayScreen = 4;
if (IsKeyPressed(KEY_EQUAL)) level++; if (IsKeyPressed(KEY_EQUAL)) level++;
@ -264,8 +256,7 @@ void UpdateGameplayScreen(void)
if (level == LEVEL3) { if ((int) globalTimer % 10 == 0) feather.active = true; } if (level == LEVEL3) { if ((int) globalTimer % 10 == 0) feather.active = true; }
else { if ((int) globalTimer % 30 == 0) feather.active = true; } else { if ((int) globalTimer % 30 == 0) feather.active = true; }
switch (feather.power) { switch (feather.power) {
case 0: feather.color = GREEN; break; case 0: feather.color = RED; break;
case 1: feather.color = RED; break;
} }
if (feather.active) { if (feather.active) {
if (((feather.hitbox.x + -feather_sprite.width) > GetScreenWidth() if (((feather.hitbox.x + -feather_sprite.width) > GetScreenWidth()
@ -273,7 +264,6 @@ void UpdateGameplayScreen(void)
if (CheckCollisionRecs(player.hitbox, feather.hitbox)) { if (CheckCollisionRecs(player.hitbox, feather.hitbox)) {
switch (feather.power) { switch (feather.power) {
case 0: player.hp++; break; case 0: player.hp++; break;
case 1: ammo += 60; break;
} }
if (!mute) PlaySoundMulti(fxfeather); if (!mute) PlaySoundMulti(fxfeather);
ResetFeather(); ResetFeather();
@ -351,8 +341,8 @@ void DrawGameplayScreen(void)
case LEVEL2: DrawTexture(background, 0, 0, ORANGE); break; case LEVEL2: DrawTexture(background, 0, 0, ORANGE); break;
case LEVEL3: DrawTexture(background, 0, 0, RED); break; case LEVEL3: DrawTexture(background, 0, 0, RED); break;
} }
DrawFPS(10, 430);
if (DebugMode) { if (DebugMode) {
DrawFPS(10, 430);
DrawRectangleLines(player.hitbox.x, player.hitbox.y, player.hitbox.width, player.hitbox.height, BLUE); DrawRectangleLines(player.hitbox.x, player.hitbox.y, player.hitbox.width, player.hitbox.height, BLUE);
DrawRectangleLines(feather.hitbox.x, feather.hitbox.y, feather.hitbox.width, feather.hitbox.height, WHITE); DrawRectangleLines(feather.hitbox.x, feather.hitbox.y, feather.hitbox.width, feather.hitbox.height, WHITE);
//DrawRectangleLines(enemy.hitbox.x, enemy.hitbox.y, enemy.hitbox.width, enemy.hitbox.height, BLACK); //DrawRectangleLines(enemy.hitbox.x, enemy.hitbox.y, enemy.hitbox.width, enemy.hitbox.height, BLACK);
@ -381,13 +371,11 @@ void DrawGameplayScreen(void)
} }
// if (level == 2) DrawTextureRec(enemy_sprite, enemy.frameRec, enemy.sprite_pos, enemy.color); // if (level == 2) DrawTextureRec(enemy_sprite, enemy.frameRec, enemy.sprite_pos, enemy.color);
DrawTextureRec(player_sprite, player.frameRec, player.sprite_pos, player.color); DrawTextureRec(player_sprite, player.frameRec, player.sprite_pos, player.color);
DrawTexture(feather_sprite, 0, 0, GREEN); DrawTexture(feather_sprite, 0, 0, RED);
DrawText(TextFormat("= %i", player.hp), 30, 30, 30, GREEN); DrawText(TextFormat("= %i", player.hp), 30, 30, 30, RED);
DrawTexture(feather_sprite, 80, 0, RED);
DrawText(TextFormat("= %i", ammo), 110, 30, 30, RED);
// if (level == 2) DrawText(TextFormat("ENEMY HP: %i", enemy.hp), GetScreenWidth() - 380, 0, 20, RED); // if (level == 2) DrawText(TextFormat("ENEMY HP: %i", enemy.hp), GetScreenWidth() - 380, 0, 20, RED);
DrawText(TextFormat("FIREWORKS LEFT: %i", fireworkAmount), GetScreenWidth() - 240, 0, 20, GREEN); // DrawText(TextFormat("FIREWORKS LEFT: %i", fireworkAmount), GetScreenWidth() - 240, 0, 20, GREEN);
if (score >= 10000) DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, (Color){ 222, 181, 0, 255 }); if (score > 500000) DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, (Color){ 222, 181, 0, 255 });
else DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, BLUE); else DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, BLUE);
if (pause && (((int)pauseTimer/30)%2)) DrawTextEx(ZadoBold, "PAUSED", (Vector2){ 280, 160 }, 60, 2, WHITE); if (pause && (((int)pauseTimer/30)%2)) DrawTextEx(ZadoBold, "PAUSED", (Vector2){ 280, 160 }, 60, 2, WHITE);
} }

View file

@ -38,11 +38,9 @@ void DrawLevelSelScreen(void)
{ {
DrawTexture(background, 0, 0, GRAY); DrawTexture(background, 0, 0, GRAY);
DrawTexture(feather_sprite, 0, 0, GREEN); DrawTexture(feather_sprite, 0, 0, RED);
DrawText(TextFormat("= %i", greenfeathers), 30, 30, 30, GREEN); DrawText(TextFormat("= %i", greenfeathers), 30, 30, 30, RED);
DrawTexture(feather_sprite, 80, 0, RED); if (score > 500000) DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, (Color){ 222, 181, 0, 255 });
DrawText(TextFormat("= %i", redfeathers), 110, 30, 30, RED);
if (score >= 10000) DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, (Color){ 222, 181, 0, 255 });
else DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, BLUE); else DrawText(TextFormat("SCORE: %i", score), 10, 65, 30, BLUE);
if (levelSelected == 0) DrawText("1", 100, 220, 60, WHITE); if (levelSelected == 0) DrawText("1", 100, 220, 60, WHITE);

View file

@ -97,8 +97,8 @@ static void update_transition(void)
if (!transFadeOut) { if (!transFadeOut) {
transAlpha += GetFrameTime(); transAlpha += GetFrameTime();
if (transAlpha > 0.76f) { if (transAlpha > 1) {
transAlpha = 0.75f; transAlpha = 1;
switch (transFromScreen) { switch (transFromScreen) {
case TITLE: UnloadTitleScreen(); break; case TITLE: UnloadTitleScreen(); break;
@ -129,7 +129,7 @@ static void update_transition(void)
} else { } else {
transAlpha -= GetFrameTime(); transAlpha -= GetFrameTime();
if (transAlpha < -0.75f) { if (transAlpha < 0) {
transAlpha = 0.0f; transAlpha = 0.0f;
transFadeOut = false; transFadeOut = false;
onTransition = false; onTransition = false;

View file

@ -11,6 +11,5 @@
extern int score; extern int score;
extern int greenfeathers; extern int greenfeathers;
extern int redfeathers;
#endif #endif