diff --git a/Cargo.lock b/Cargo.lock index 74a3ef9153..279bfad353 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1061,7 +1061,7 @@ dependencies = [ "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "sim 0.1.0", - "svg_face 0.1.0 (git+https://github.com/dabreegster/svg_face)", + "svg_face 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "webbrowser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "xmltree 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3283,8 +3283,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "svg_face" -version = "0.1.0" -source = "git+https://github.com/dabreegster/svg_face#61b3c9f099b36d12935048233072e7058a0e7f2d" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4527,7 +4527,7 @@ dependencies = [ "checksum strsim 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -"checksum svg_face 0.1.0 (git+https://github.com/dabreegster/svg_face)" = "" +"checksum svg_face 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24250a6facea1335447ffe5db20842749c5c231e259548e14f7e4fda26132b8f" "checksum svgtypes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" diff --git a/game/Cargo.toml b/game/Cargo.toml index 0fe882f528..619efaa7d7 100644 --- a/game/Cargo.toml +++ b/game/Cargo.toml @@ -30,7 +30,7 @@ rand = "0.7.0" rand_xorshift = "0.2.0" reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] } serde = "1.0.110" -svg_face = { git = "https://github.com/dabreegster/svg_face" } +svg_face = "0.1.2" sim = { path = "../sim" } webbrowser = "0.5.2" xmltree = "0.10.0" diff --git a/game/src/info/person.rs b/game/src/info/person.rs index b39ffeec8a..677a45a661 100644 --- a/game/src/info/person.rs +++ b/game/src/info/person.rs @@ -234,14 +234,11 @@ pub fn bio( let nickname = petname::Petnames::default().generate(&mut rng, 2, " "); let age = rng.gen_range(5, 100); - rows.extend(make_table( - ctx, - vec![ - ("Nickname", nickname), - ("Age", age.to_string()), - ("Debug ID", format!("{:?}", person.orig_id)), - ], - )); + let mut table = vec![("Nickname", nickname), ("Age", age.to_string())]; + if app.opts.dev { + table.push(("Debug ID", format!("{:?}", person.orig_id))); + } + rows.extend(make_table(ctx, table)); // TODO Mad libs! // - Keeps a collection of ___ at all times // - Origin story: accidentally fell into a vat of cheese curds diff --git a/game/src/layer/mod.rs b/game/src/layer/mod.rs index 492bd238f6..3bd28c71c3 100644 --- a/game/src/layer/mod.rs +++ b/game/src/layer/mod.rs @@ -70,16 +70,19 @@ impl PickLayer { hotkey_btn(ctx, app, "None", Key::N), hotkey_btn(ctx, app, "map edits", Key::E), hotkey_btn(ctx, app, "worst traffic jams", Key::J), - hotkey_btn(ctx, app, "elevation", Key::S), hotkey_btn(ctx, app, "parking occupancy", Key::P), hotkey_btn(ctx, app, "delay", Key::D), hotkey_btn(ctx, app, "throughput", Key::T), - hotkey_btn(ctx, app, "backpressure", Key::Z), hotkey_btn(ctx, app, "bike network", Key::B), hotkey_btn(ctx, app, "bus network", Key::U), hotkey_btn(ctx, app, "population map", Key::X), hotkey_btn(ctx, app, "amenities", Key::A), ]); + if app.opts.dev { + // These need some work. + col.push(hotkey_btn(ctx, app, "backpressure", Key::Z)); + col.push(hotkey_btn(ctx, app, "elevation", Key::S)); + } if app.primary.sim.get_pandemic_model().is_some() { col.push(hotkey_btn(ctx, app, "pandemic model", Key::Y)); }