diff --git a/experiment/src/game.rs b/experiment/src/game.rs index ba9d27d322..29cef72bac 100644 --- a/experiment/src/game.rs +++ b/experiment/src/game.rs @@ -63,7 +63,7 @@ impl Game { let status_panel = Panel::new(Widget::col(vec![ "Complete Deliveries".draw_text(ctx).named("score label"), Widget::draw_batch(ctx, GeomBatch::new()).named("score"), - "Remaining Gifts".draw_text(ctx).named("energy label"), + "Remaining Presents".draw_text(ctx).named("energy label"), Widget::draw_batch(ctx, GeomBatch::new()).named("energy"), ])) .aligned(HorizontalAlignment::RightInset, VerticalAlignment::TopInset) @@ -298,7 +298,7 @@ impl Game { if self.state.has_energy() { if self.state.energyless_arrow.is_some() { self.state.energyless_arrow = None; - let label = "Remaining Gifts".draw_text(ctx); + let label = "Remaining Presents".draw_text(ctx); self.status_panel.replace(ctx, "energy label", label); } } else { @@ -308,8 +308,9 @@ impl Game { app.time, self.state.bldgs.all_stores(), )); - let label = Text::from(Line("Out of gifts - refill from a store!").fg(Color::RED)) - .draw(ctx); + let label = + Text::from(Line("Out of presents - refill from a store!").fg(Color::RED)) + .draw(ctx); self.status_panel.replace(ctx, "energy label", label); } self.state @@ -479,7 +480,7 @@ struct GameState { // Number of deliveries score: usize, - // Number of gifts currently being carried + // Number of presents currently being carried energy: usize, boost: Duration, diff --git a/game/src/debug/streetmix.rs b/game/src/debug/streetmix.rs index 2a58a31868..163e35bf89 100644 --- a/game/src/debug/streetmix.rs +++ b/game/src/debug/streetmix.rs @@ -29,7 +29,7 @@ fn road(id: RoadID, map: &Map) -> serde_json::Map serde_json::Map { let mut segment = serde_json::Map::new(); segment.insert("id".to_string(), lane.id.to_string().into()); - segment.insert("width".to_string(), lane.width.inner_meters().into()); + segment.insert("width".to_string(), lane.width.to_feet().into()); // TODO I'm taking wild stabs at these values for now. Once I can visualize the results, will // iterate on these. diff --git a/geom/src/distance.rs b/geom/src/distance.rs index f6d3ac3bf9..0089c8ea0b 100644 --- a/geom/src/distance.rs +++ b/geom/src/distance.rs @@ -68,6 +68,11 @@ impl Distance { self.0 } + /// Returns the distance in feet. + pub fn to_feet(self) -> f64 { + self.0 * 3.28084 + } + /// Describes the distance according to formatting rules. pub fn to_string(self, fmt: &UnitFmt) -> String { if fmt.metric { @@ -78,7 +83,7 @@ impl Distance { format!("{}km", (km * 10.0).round() / 10.0) } } else { - let feet = self.0 * 3.28084; + let feet = self.to_feet(); let miles = feet / 5280.0; if miles >= 0.1 { format!("{} miles", (miles * 10.0).round() / 10.0)