a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-28 03:35:51 +03:00
Code Issues Projects Releases Wiki Activity

first wave of character art from holly!!!

Browse Source
This commit is contained in:
Dustin Carlino 2020-07-13 21:09:36 -07:00
parent b4b8556f46
commit 33c5ffef4c
7 changed files with 323242 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -99,6 +99,7 @@ Others:
- Graphic design advice from [Starcat Games](http://starcatgames.com/),
[Daniel Huffman](https://somethingaboutmaps.wordpress.com/),
[Brian Prince](http://thebaprince.com/)
- Character art by [Holly Hansel](http://www.hollyhansel.com/)
- Lightning-fast pathfinding thanks to
[fast_paths](https://github.com/easbar/fast_paths) by Andreas Barth
(<easbar.mail@posteo.net>)

24494
data/system/assets/characters/boss.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 1.8 MiB

101481
data/system/assets/characters/parents.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 7.4 MiB

197233
data/system/assets/characters/party_bros.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 14 MiB

34
game/src/cutscene.rs
View File

@ -1,8 +1,8 @@
use crate::app::App;
use crate::game::{DrawBaselayer, State, Transition};
use ezgui::{
hotkey, hotkeys, Btn, Color, Composite, EventCtx, GfxCtx, Key, Line, Outcome, RewriteColor,
Text, Widget,
hotkey, hotkeys, Btn, Color, Composite, EventCtx, GeomBatch, GfxCtx, Key, Line, Outcome,
RewriteColor, Text, Widget,
};
pub struct CutsceneBuilder {
@ -196,7 +196,15 @@ fn make_panel(
Widget::custom_col(vec![
match scenes[idx].layout {
Layout::PlayerSpeaking => Widget::custom_row(vec![
Widget::draw_svg(ctx, "system/assets/characters/boss.svg"),
Widget::draw_batch(
ctx,
GeomBatch::screenspace_svg(
ctx.prerender,
"system/assets/characters/boss.svg",
)
.scale(0.75)
.autocrop(),
),
Widget::custom_row(vec![
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx),
Widget::draw_svg(ctx, "system/assets/characters/player.svg"),
@ -204,12 +212,28 @@ fn make_panel(
.align_right(),
]),
Layout::BossSpeaking => Widget::custom_row(vec![
Widget::draw_svg(ctx, "system/assets/characters/boss.svg"),
Widget::draw_batch(
ctx,
GeomBatch::screenspace_svg(
ctx.prerender,
"system/assets/characters/boss.svg",
)
.scale(0.75)
.autocrop(),
),
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx),
Widget::draw_svg(ctx, "system/assets/characters/player.svg").align_right(),
]),
Layout::Extra(name) => Widget::custom_row(vec![
Widget::draw_svg(ctx, "system/assets/characters/boss.svg").align_left(),
Widget::draw_batch(
ctx,
GeomBatch::screenspace_svg(
ctx.prerender,
"system/assets/characters/boss.svg",
)
.scale(0.75)
.autocrop(),
),
Widget::col(vec![
Widget::draw_svg(ctx, format!("system/assets/characters/{}.svg", name)),
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx),

1
game/src/pregame.rs
View File

@ -256,6 +256,7 @@ impl About {
Text::from_multiline(vec![
Line("A/B STREET").display_title(),
Line("Created by Dustin Carlino, UX by Yuwen Li"),
Line("Character art by Holly Hansel"),
Line(""),
Line(
"Data from OpenStreetMap, King County GIS, and Puget Sound Regional \

16
game/src/sandbox/gameplay/mod.rs
View File

@ -313,10 +313,18 @@ impl FinalScore {
Box::new(FinalScore {
composite: Composite::new(
Widget::custom_row(vec![
Widget::draw_svg(ctx, "system/assets/characters/boss.svg")
.container()
.outline(10.0, Color::BLACK)
.padding(10),
Widget::draw_batch(
ctx,
GeomBatch::screenspace_svg(
ctx.prerender,
"system/assets/characters/boss.svg",
)
.scale(0.75)
.autocrop(),
)
.container()
.outline(10.0, Color::BLACK)
.padding(10),
Widget::col(vec![
msg.draw_text(ctx),
// TODO Adjust wording