From 477b14e17d05bcc36d0c7aa433c044ad6db9733e Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Thu, 17 Dec 2020 10:26:21 -0800
Subject: [PATCH] Tune vehicles, levels a little.

---
 experiment/src/levels.rs   | 36 ++++++++++++++++++------------------
 experiment/src/session.rs  |  4 ++--
 experiment/src/title.rs    |  1 +
 experiment/src/vehicles.rs | 22 +++++++++++-----------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/experiment/src/levels.rs b/experiment/src/levels.rs
index 01eace1ab9..3d7d863287 100644
--- a/experiment/src/levels.rs
+++ b/experiment/src/levels.rs
@@ -21,20 +21,6 @@ pub struct Level {
 impl Level {
     pub fn all() -> Vec<Level> {
         vec![
-            Level {
-                title: "Montlake".to_string(),
-                description: "With the Montlake Market closed, how will you manage to bring cheer \
-                              to this sleepy little pocket of the city?"
-                    .to_string(),
-                map: MapName::seattle("montlake"),
-                start: osm::NodeID(53084814),
-                minimap_zoom: 1,
-                time_limit: Duration::seconds(50.0),
-                goal: 20,
-
-                unlock_upzones: 2,
-                unlock_vehicles: vec![],
-            },
             Level {
                 title: "University District".to_string(),
                 description: "Tear yourself away from all the bubble tea to deliver presents to \
@@ -44,10 +30,10 @@ impl Level {
                 start: osm::NodeID(53162661),
                 minimap_zoom: 1,
                 time_limit: Duration::seconds(90.0),
-                goal: 25,
+                goal: 1000,
 
-                unlock_upzones: 2,
-                unlock_vehicles: vec!["bike".to_string()],
+                unlock_upzones: 1,
+                unlock_vehicles: vec!["sleigh".to_string()],
             },
             Level {
                 title: "Wallingfjord".to_string(),
@@ -66,7 +52,7 @@ impl Level {
             // TODO Super dense, starting point isn't even near apartments, run out of gifts after
             // a few buildings. Unexpectedly hard!
             Level {
-                title: "South Lake Union".to_string(),
+                title: "South Pole Union".to_string(),
                 description: "Don't get turned around in all of the construction while you \
                               deliver to the apartments here!"
                     .to_string(),
@@ -79,6 +65,20 @@ impl Level {
                 unlock_upzones: 2,
                 unlock_vehicles: vec![],
             },
+            Level {
+                title: "Montlake".to_string(),
+                description: "With the Montlake Market closed, how will you manage to bring cheer \
+                              to this sleepy little pocket of the city?"
+                    .to_string(),
+                map: MapName::seattle("montlake"),
+                start: osm::NodeID(53084814),
+                minimap_zoom: 1,
+                time_limit: Duration::minutes(3),
+                goal: 1000,
+
+                unlock_upzones: 2,
+                unlock_vehicles: vec![],
+            },
             Level {
                 title: "Magnolia".to_string(),
                 description: "Struggle past the intense hills and restrictive zoning to tackle \
diff --git a/experiment/src/session.rs b/experiment/src/session.rs
index 7b0f502900..ec8cc82f19 100644
--- a/experiment/src/session.rs
+++ b/experiment/src/session.rs
@@ -75,8 +75,8 @@ impl Session {
 
             high_scores,
             levels_unlocked: 1,
-            current_vehicle: "sleigh".to_string(),
-            vehicles_unlocked: vec!["sleigh".to_string()].into_iter().collect(),
+            current_vehicle: "bike".to_string(),
+            vehicles_unlocked: vec!["bike".to_string()].into_iter().collect(),
             upzones_unlocked: 0,
 
             music: Music::empty(),
diff --git a/experiment/src/title.rs b/experiment/src/title.rs
index 4b3d3b9366..64637a330d 100644
--- a/experiment/src/title.rs
+++ b/experiment/src/title.rs
@@ -177,6 +177,7 @@ impl Credits {
                 link(ctx, "Land use data from Seattle GeoData", "https://data-seattlecitygis.opendata.arcgis.com/datasets/current-land-use-zoning-detail"),
                 link(ctx, "Music by Royalty Free Music", "https://soundcloud.com/royaltyfreebackgroundmusic/creative-commons-music-4061"),
                 link(ctx, "Fonts and icons by various sources", "https://dabreegster.github.io/abstreet/howto/#data-source-licensing"),
+                "Playtesting by Fridgehaus".draw_text(ctx),
                 Btn::text_bg2("Back").build_def(ctx, Key::Enter).centered_horiz(),
             ]))
             .build(ctx),
diff --git a/experiment/src/vehicles.rs b/experiment/src/vehicles.rs
index 199765a29c..1426b34ebf 100644
--- a/experiment/src/vehicles.rs
+++ b/experiment/src/vehicles.rs
@@ -15,24 +15,24 @@ pub struct Vehicle {
 impl Vehicle {
     pub fn get(name: &str) -> Vehicle {
         match name {
-            "sleigh" => Vehicle {
-                name: "sleigh".to_string(),
-
-                speed: Speed::miles_per_hour(30.0),
-                max_energy: 20,
-
-                draw_frames: vec!["sleigh.svg"],
-                scale: 0.08,
-            },
             "bike" => Vehicle {
                 name: "bike".to_string(),
 
-                speed: Speed::miles_per_hour(40.0),
-                max_energy: 50,
+                speed: Speed::miles_per_hour(30.0),
+                max_energy: 100,
 
                 draw_frames: vec!["bike1.svg", "bike2.svg", "bike1.svg", "bike3.svg"],
                 scale: 0.05,
             },
+            "sleigh" => Vehicle {
+                name: "sleigh".to_string(),
+
+                speed: Speed::miles_per_hour(25.0),
+                max_energy: 200,
+
+                draw_frames: vec!["sleigh.svg"],
+                scale: 0.08,
+            },
             "cargo bike" => Vehicle {
                 name: "cargo bike".to_string(),