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

rename scenarios to be less confusing

Browse Source
This commit is contained in:
Dustin Carlino 2020-01-19 14:39:46 -08:00
parent 2c5030926c
commit ca6b81099c
8 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/MANIFEST.txt
View File

@ -9,13 +9,13 @@ e98a09a1628d8e7b9c2bad7e077e6f4c data/system/maps/montlake.bin
c1f770d7a77bd009cec2595137321b85 data/system/synthetic_maps/signal_double.json
bfdbd18dd24a125d6f42f5b812be583f data/system/synthetic_maps/signal_single.json
7707b64b382c09a9635993856be6571c data/system/synthetic_maps/signal_fan_in.json
294605b630db542a54e8fb48df1bb645 data/system/scenarios/ballard/weekday_typical_traffic_from_psrc.bin
6a694de6993889cd64e625c3f88f91f3 data/system/scenarios/23rd/weekday_typical_traffic_from_psrc.bin
5c1de856be2e725142801bd3a6abd1d2 data/system/scenarios/downtown/weekday_typical_traffic_from_psrc.bin
b1ffd47cd5036a2322d4a0789040bfa4 data/system/scenarios/huge_seattle/weekday_typical_traffic_from_psrc.bin
914ed9234c9799a0332b1fd86c3b23a5 data/system/scenarios/caphill/weekday_typical_traffic_from_psrc.bin
ab8ab9bcf674f1d91d85d83ff313c56e data/system/scenarios/montlake/weekday_typical_traffic_from_psrc.bin
4f94a0967656442fa6bdaa602a564f9c data/system/prebaked_results/23rd/weekday_typical_traffic_from_psrc.bin
4bd6932b24539a6fb0d3896c0b72186e data/system/prebaked_results/signal_single/tutorial lvl1.bin
bc80d17d4d11cde80a9393f2493ff432 data/system/prebaked_results/signal_single/tutorial lvl2.bin
4f5c6195a546b3e453073526f6ff0c37 data/system/prebaked_results/montlake/weekday_typical_traffic_from_psrc.bin
294605b630db542a54e8fb48df1bb645 data/system/scenarios/ballard/weekday.bin
6a694de6993889cd64e625c3f88f91f3 data/system/scenarios/23rd/weekday.bin
5c1de856be2e725142801bd3a6abd1d2 data/system/scenarios/downtown/weekday.bin
b1ffd47cd5036a2322d4a0789040bfa4 data/system/scenarios/huge_seattle/weekday.bin
914ed9234c9799a0332b1fd86c3b23a5 data/system/scenarios/caphill/weekday.bin
ab8ab9bcf674f1d91d85d83ff313c56e data/system/scenarios/montlake/weekday.bin
692ce00b68b552eb05921dcf9d978a53 data/system/prebaked_results/23rd/weekday.bin
9b03eee27c1a20f941848360ff4e6425 data/system/prebaked_results/signal_single/tutorial lvl1.bin
fd451f62137814d9c91f38cc2e2bea62 data/system/prebaked_results/signal_single/tutorial lvl2.bin
ffaca90577fa26563bc3dcca09842ed5 data/system/prebaked_results/montlake/weekday.bin

26
docs/INSTRUCTIONS.md
View File

@ -35,24 +35,20 @@ General controls:
- Click and drag to move
- Scroll wheel or touchpad to zoom
- Menus should work as expected. Most actions have a keybinding.
- You can hover over an object and left-click to see more actions.
- Click an object to see more actions
- The bottom bar shows key shortcuts
Things to try:
- In sandbox mode, hover over an intersection, right click, and spawn agents.
- To run a realistic, full day's worth of traffic, go to sandbox mode, then
"start a scenario" (hotkey **s**) and choose the "weekday_typical_traffic"
entry. Time (shown in the top-right corner) starts at midnight. Things tend to
get interesting around 6am -- use the speed controls in the top-left. Try
zooming in for details, and zooming out to see an overview.
- The full scenario should complete successfully on the small montlake map. On
other maps, it currently gridlocks or crashes. Most of these are known
issues.
- Go to edit mode (note this will reset the simulation). Use the buttons at the
top to pick a lane type, then hover over a lane and press **space** to change
it. Deselect the lane tool, then click an intersection to edit stop signs or
traffic signals.
- In sandbox mode, select an intersection, and spawn agents.
- Change the default "random" traffic in sandbox mode to "weekday" to see
realistic trips over a full weekday.
- The weekday traffic scenario should complete successfully on the small
montlake map. On other maps, it currently gridlocks or crashes. Most of
these are known issues.
- Go to edit mode (note this will reset the simulation). Select a lane type at
the top, then hover over a lane and press **space** to change it. Deselect the
lane tool, then click an intersection to edit stop signs or traffic signals.
- Go back to the main menu and pick a challenge. Eventually these will be very
self-guided, but there are various problems with all of them right now.

4
docs/dev.md
View File

@ -34,8 +34,8 @@ One-time setup:
- You can start the game in different modes using flags:
- `cargo run -- --dev ../data/system/maps/downtown.bin` starts on a particular
map
- `cargo run ../data/system/scenarios/caphill/weekday_typical_traffic_from_psrc.bin`
starts with a scenario (which is tied to a certain map)
- `cargo run ../data/system/scenarios/caphill/weekday.bin` starts with a
scenario (which is tied to a certain map)
- `cargo run -- --challenge=trafficsig/tut2` starts on a particular challenge.
See the list of aliases by passing in a bad value here.
- `cargo run ../data/player/saves/montlake/no_edits_unnamed/00h00m20.3s.bin`

6
game/assets/tools/info.svg
View File

@ -1,5 +1,3 @@
<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13 0C5.824 0 0 5.824 0 13C0 20.176 5.824 26 13 26C20.176 26 26 20.176 26 13C26 5.824 20.176 0 13 0ZM13 2C19.072 2 24 6.928 24 13C24 19.072 19.072 24 13 24C6.928 24 2 19.072 2 13C2 6.928 6.928 2 13 2Z" fill="white"/>
<path d="M14.9997 7.25004C14.9997 7.84679 14.7627 8.4191 14.3407 8.84107C13.9188 9.26303 13.3465 9.50009 12.7497 9.50009C12.153 9.50009 11.5807 9.26303 11.1588 8.84107C10.7368 8.4191 10.4998 7.84679 10.4998 7.25004C10.4998 6.6533 10.7368 6.08099 11.1588 5.65902C11.5807 5.23706 12.153 5 12.7497 5C13.3465 5 13.9188 5.23706 14.3407 5.65902C14.7627 6.08099 14.9997 6.6533 14.9997 7.25004V7.25004Z" fill="white"/>
<path d="M15.133 19.192C15.1192 19.738 15.3752 19.892 15.9984 19.956L17 19.976V21H9.1854V19.976L10.286 19.956C10.9442 19.936 11.1024 19.68 11.1514 19.192V13.0294C11.1584 12.0536 9.8922 12.2068 9 12.2358V11.221L15.133 11" fill="white"/>
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 0C5.376 0 0 5.376 0 12C0 18.624 5.376 24 12 24C18.624 24 24 18.624 24 12C24 5.376 18.624 0 12 0ZM13.2 18H10.8V10.8H13.2V18ZM13.2 8.4H10.8V6H13.2V8.4Z" fill="white"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 976 B

After

Width:  |  Height:  |  Size: 282 B

2
game/src/pregame.rs
View File

@ -135,7 +135,7 @@ pub fn main_menu(ctx: &mut EventCtx, ui: &UI) -> Box<dyn State> {
Box::new(SandboxMode::new(
ctx,
ui,
GameplayMode::PlayScenario("random scenario with some agents".to_string()),
GameplayMode::PlayScenario("random".to_string()),
)),
EventLoopMode::Animation,
))

4
game/src/sandbox/gameplay/freeform.rs
View File

@ -23,7 +23,7 @@ pub struct Freeform {
impl Freeform {
pub fn new(ctx: &mut EventCtx, ui: &UI) -> (Composite, Box<dyn GameplayState>) {
(
freeform_controller(ctx, ui, GameplayMode::Freeform, "empty scenario"),
freeform_controller(ctx, ui, GameplayMode::Freeform, "none"),
Box::new(Freeform {
spawn_pts: BTreeSet::new(),
}),
@ -73,7 +73,7 @@ pub fn freeform_controller(
ManagedWidget::draw_text(ctx, Text::from(Line("Sandbox").size(26))).margin(5),
ManagedWidget::draw_batch(
ctx,
GeomBatch::from(vec![(Color::WHITE, Polygon::rectangle(5.0, 50.0))]),
GeomBatch::from(vec![(Color::WHITE, Polygon::rectangle(2.0, 50.0))]),
)
.margin(5),
ManagedWidget::draw_text(ctx, Text::from(Line("Map:").size(18).roboto_bold()))

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

@ -71,9 +71,9 @@ impl GameplayMode {
unreachable!()
}
}
_ => "weekday_typical_traffic_from_psrc".to_string(),
_ => "weekday".to_string(),
};
Some(if name == "random scenario with some agents" {
Some(if name == "random" {
if let Some(n) = num_agents {
Scenario::scaled_run(map, n)
} else {
@ -210,7 +210,7 @@ fn change_scenario(wiz: &mut Wizard, ctx: &mut EventCtx, ui: &mut UI) -> Option<
.choose_string("Instantiate which scenario?", || {
let mut list =
abstutil::list_all_objects(abstutil::path_all_scenarios(ui.primary.map.get_name()));
list.push("random scenario with some agents".to_string());
list.push("random".to_string());
list.push("just buses".to_string());
list.push("empty".to_string());
list

2
popdat/src/trips.rs
View File

@ -314,7 +314,7 @@ pub fn trips_to_scenario(map: &Map, timer: &mut Timer) -> Scenario {
}
Scenario {
scenario_name: "weekday_typical_traffic_from_psrc".to_string(),
scenario_name: "weekday".to_string(),
map_name: map.get_name().to_string(),
seed_buses: true,
seed_parked_cars: Vec::new(),