a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-24 23:15:24 +03:00
Code Issues Projects Releases Wiki Activity

Fix the traffic signal challenge. It shouldn't reset the simulation after editing!

Browse Source 
And fix up the score panel a bit
This commit is contained in:
Dustin Carlino 2021-04-26 10:49:15 -07:00
parent 4826808b9b
commit 36427d163c
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
game/src/edit/mod.rs
View File

@ -89,7 +89,14 @@ impl EditMode {
app.primary
.map
.recalculate_pathfinding_after_edits(&mut timer);
if app.primary.current_flags.live_map_edits {
if GameplayMode::FixTrafficSignals == self.mode {
app.primary.sim = old_sim;
app.primary.dirty_from_edits = true;
app.primary
.sim
.handle_live_edited_traffic_signals(&app.primary.map);
Transition::Pop
} else if app.primary.current_flags.live_map_edits {
app.primary.sim = old_sim;
app.primary.dirty_from_edits = true;
app.primary

71
game/src/sandbox/gameplay/fix_traffic_signals.rs
View File

@ -2,8 +2,8 @@ use geom::{Duration, Time};
use map_gui::ID;
use map_model::IntersectionID;
use widgetry::{
Color, EventCtx, GfxCtx, HorizontalAlignment, Image, Key, Line, Outcome, Panel, RewriteColor,
State, Text, VerticalAlignment, Widget,
Color, EventCtx, GfxCtx, HorizontalAlignment, Image, Key, Line, Outcome, Panel, State, Text,
VerticalAlignment, Widget,
};
use crate::app::Transition;
@ -246,45 +246,38 @@ impl GameplayState for FixTrafficSignals {
.aligned(HorizontalAlignment::Right, VerticalAlignment::Top)
.build(ctx);
} else {
let meter = if let Some((_, delay)) = self.worst {
Widget::row(vec![
Text::from_all(vec![
Line("Worst delay: "),
Line(delay.to_string(&app.opts.units)).fg(
if delay < Duration::minutes(5) {
Color::hex("#F9EC51")
} else if delay < Duration::minutes(15) {
Color::hex("#EE702E")
} else {
Color::hex("#EB3223")
},
),
])
.into_widget(ctx),
let meter = Widget::row(vec![
ctx.style()
.btn_plain
.icon("system/assets/tools/location.svg")
.disabled(self.worst.is_none())
.build_widget(ctx, "go to slowest intersection"),
Text::from_all(vec![
Line("Worst delay: "),
if let Some((_, delay)) = self.worst {
Line(delay.to_string(&app.opts.units)).fg(if delay < Duration::minutes(5) {
Color::hex("#F9EC51")
} else if delay < Duration::minutes(15) {
Color::hex("#EE702E")
} else {
Color::hex("#EB3223")
})
} else {
Line("none!").secondary()
},
])
.into_widget(ctx)
.centered_vert(),
if app.primary.dirty_from_edits {
ctx.style()
.btn_plain
.icon("system/assets/tools/location.svg")
.build_widget(ctx, "go to slowest intersection")
.align_right(),
])
} else {
Widget::row(vec![
if app.primary.dirty_from_edits {
ctx.style()
.btn_plain
.icon("system/assets/tools/info.svg")
.build_widget(ctx, "explain score")
} else {
Widget::nothing()
},
Text::from_all(vec![Line("Worst delay: "), Line("none!").secondary()])
.into_widget(ctx),
Image::from_path("system/assets/tools/location.svg")
.color(RewriteColor::ChangeAlpha(0.5))
.into_widget(ctx)
.align_right(),
])
};
.icon("system/assets/tools/info.svg")
.build_widget(ctx, "explain score")
.align_right()
} else {
Widget::nothing()
},
]);
self.top_right = Panel::new(Widget::col(vec![
challenge_header(ctx, "Traffic signal survivor"),