diff options
Diffstat (limited to 'screen')
| -rw-r--r-- | screen/gameplay.cpp | 26 | ||||
| -rw-r--r-- | screen/main_menu.cpp | 5 |
2 files changed, 24 insertions, 7 deletions
diff --git a/screen/gameplay.cpp b/screen/gameplay.cpp index 2f30c78..430c18d 100644 --- a/screen/gameplay.cpp +++ b/screen/gameplay.cpp @@ -13,20 +13,36 @@ void drawGameplay(GameState &gs){ + if (gs.GameOver && !IsDialogRunning(gs)) { + if (gs.GameOverTime == -1.0f){ + gs.GameOverTime = GetTime(); + } + + float t = (GetTime() - gs.GameOverTime)/2.0f; + if (t > 1.0f) return; + + float a = 0.5f - 0.5f * cosf(t * PI); + + DrawTextureV(getCurrentScene(gs, gs.curPos), + ZERO_VEC, + ColorAlpha(WHITE, 1.0f - a)); + return; + } + if (gs.timeSinceSceneChange == -1) { DrawTextureV(getCurrentScene(gs), ZERO_VEC, WHITE); + drawCirno(gs); + if (gs.curExp != HURT && gs.flowerOnHead) { + DrawTextureV(gs.AssetManager.load("flower"), ZERO_VEC, WHITE); + } } else { DrawSceneChange(gs); } if (gs.curExp != NEUTRAL && !IsDialogRunning(gs)) { gs.curExp = NEUTRAL; } - drawCirno(gs); - if (gs.curExp != HURT && gs.flowerOnHead) { - DrawTextureV(gs.AssetManager.load("flower"), ZERO_VEC, WHITE); - } if (DEBUG) { DrawText(TextFormat("%d, %d", (int)gs.currentMousePos.x, (int)gs.currentMousePos.y), 0, 40, 20, YELLOW);} - ui::DrawText(TextFormat("Explored : %d/13", gs.explored.size()), 20, 10, 26, RED); + ui::DrawText(TextFormat("Explored : %d/12", gs.explored.size()), 5, 5, 17, RED); if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) and !IsDialogRunning(gs)) { ProcessClick(gs); } diff --git a/screen/main_menu.cpp b/screen/main_menu.cpp index 09a136d..bc7ad08 100644 --- a/screen/main_menu.cpp +++ b/screen/main_menu.cpp @@ -38,6 +38,7 @@ void drawMainMenu(GameState &gs){ gs.current_screen = GAMEPLAY; } } - ui::DrawTextV("Happy Cirno Day", {22, 25}, 22, ColorAlpha(YELLOW, Clamp(gs.timeSinceSceneChange/(SCENE_CHANGE/2.0f), 0, 1))); - ui::DrawTextV("A short story by\nsamosagaming69\n& silli_chilli", {22, 60}, 14, ColorAlpha(WHITE, Clamp(gs.timeSinceSceneChange/(SCENE_CHANGE/2.0f), 0, 1))); + ui::DrawTextV("Happy Cirno Day", {22, 20}, 22, ColorAlpha(YELLOW, Clamp(gs.timeSinceSceneChange/(SCENE_CHANGE/2.0f), 0, 1))); + ui::DrawTextV("A short story by\nsamosagaming69 (Odia\ntwinky boy) &\nsilli_chilli", {22, 48}, 14, ColorAlpha(GREEN, Clamp(gs.timeSinceSceneChange/(SCENE_CHANGE/2.0f), 0, 1))); + ui::DrawTextV("Music: Tomboyish Prelude\nAlbum: Fantasy Kaleidoscope OST\nCircle: Yuuhei Satellite\nArrangement: Iceon", {3, 323}, 12, ColorAlpha(ORANGE, Clamp(gs.timeSinceSceneChange/(SCENE_CHANGE/2.0f), 0, 1))); } |