evan/ludum-dare-48
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into outofbreathscreen

Browse Source
This commit is contained in:
wm-c 2021-04-25 14:27:28 -04:00
commit 74ba0ffab9
5 changed files with 24 additions and 1086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/map/fishStill.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

1069
assets/tileEditor/game.js
View File

File diff suppressed because one or more lines are too long

3
src/logic/gameend.rs
View File

@ -28,6 +28,9 @@ impl Screen for GameEndScreen {
draw_handle.clear_background(Color::GRAY);
// TODO: Maybe we can stick some art here?
// Render the background
draw_handle.draw_texture(&game_core.resources.shop_background, 0, 0, Color::WHITE);
// Window dimensions
let win_height = draw_handle.get_screen_height();
let win_width = draw_handle.get_screen_width();

26
src/logic/loadingscreen.rs
View File

@ -89,10 +89,10 @@ impl LoadingScreen {
let mask = self.get_logo_mask(playthrough_percent);
// Create modified colors
let alpha_orange = Color {
r: RUST_ORANGE.r,
g: RUST_ORANGE.g,
b: RUST_ORANGE.b,
let alpha_black = Color {
r: 0,
g: 0,
b: 0,
a: mask.a,
};
@ -102,7 +102,7 @@ impl LoadingScreen {
win_height / 2 - 128,
256,
256,
alpha_orange,
alpha_black,
);
draw_handle.draw_rectangle(
win_width / 2 - 112,
@ -111,19 +111,19 @@ impl LoadingScreen {
224,
Color::WHITE,
);
draw_handle.draw_text(
"rust",
win_width / 2 - 69,
win_height / 2 + 18,
50,
alpha_orange,
);
// draw_handle.draw_text(
// "rust",
// win_width / 2 - 69,
// win_height / 2 + 18,
// 50,
// alpha_orange,
// );
draw_handle.draw_text(
"raylib",
win_width / 2 - 44,
win_height / 2 + 48,
50,
alpha_orange,
alpha_black,
);
// Move on to next logo if needed

12
src/logic/mainmenu.rs
View File

@ -28,8 +28,10 @@ impl Screen for MainMenuScreen {
let win_height = draw_handle.get_screen_height();
let win_width = draw_handle.get_screen_width();
// Clear frame
draw_handle.clear_background(Color::BLUE);
// // Clear frame
// draw_handle.clear_background(Color::BLUE);
// Render the background
draw_handle.draw_texture(&game_core.resources.shop_background, 0, 0, Color::WHITE);
// Render title
draw_handle.draw_text(
@ -56,7 +58,7 @@ impl Screen for MainMenuScreen {
(win_width / 4),
60,
match hovering_play_button {
true => Color::GREEN,
true => Color::BLUE,
false => Color::BLACK,
},
);
@ -66,7 +68,7 @@ impl Screen for MainMenuScreen {
(win_width / 4) + 100,
60,
match hovering_shop_button {
true => Color::GREEN,
true => Color::BLUE,
false => Color::BLACK,
},
);
@ -76,7 +78,7 @@ impl Screen for MainMenuScreen {
(win_width / 4) + 200,
60,
match hovering_quit_button {
true => Color::GREEN,
true => Color::RED,
false => Color::BLACK,
},
);