Surface world: grass in daylight, forests, cliffs with cave mouths; free-game and editor option

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/menu.rs

@@ -230,6 +230,7 @@ enum Btn {
     Tab(usize),
     Change(usize, i32),
     MapW(i32),
+    Land,
     MapH(i32),
     Difficulty(i32),
     Start,
@@ -675,6 +676,10 @@ impl Menu {
                 settings.difficulty = (settings.difficulty as i32 + d).rem_euclid(3) as u8;
                 MenuAction::SettingsChanged
             }
+            Some(Btn::Land) => {
+                settings.surface = !settings.surface;
+                MenuAction::SettingsChanged
+            }
             Some(Btn::MapH(d)) => {
                 settings.map_h = (settings.map_h as i32 + d * 32).clamp(MIN_SIZE as i32, MAX_SIZE as i32) as usize;
                 MenuAction::SettingsChanged
@@ -1153,27 +1158,30 @@ impl Menu {
         let sh = sh();
         let (mx, my) = mouse();
         let cols = 48.min((sw / CW()) as i32);
-        let rows = 22;
+        let rows = 25;
         let x = grid_center(sw, cols as f32 * CW()).max(0.0);
         let y = (grid_center_y(sh, rows as f32 * CH())).max(0.0);
         gfx.window_titled(x, y, cols, rows, S(), true, FRAME_HI, Color::new(0.05, 0.03, 0.04, 0.97), &tr("menu.new"), FRAME_HI);
         let diff = tr(&format!("diff.{}", s.difficulty.min(2)));
-        let lines = [("newgame.width", s.map_w.to_string(), 0), ("newgame.height", s.map_h.to_string(), 1), ("newgame.difficulty", diff, 2)];
+        let land = tr(if s.surface { "newgame.land1" } else { "newgame.land0" });
+        let lines = [("newgame.width", s.map_w.to_string(), 0), ("newgame.height", s.map_h.to_string(), 1), ("newgame.difficulty", diff, 2), ("newgame.land", land, 3)];
         for (k, (key, val, which)) in lines.iter().enumerate() {
             let (key, which) = (*key, *which);
             let by = y + CH() * (2.0 + k as f32 * 2.5);
             gfx.text(&tr(key), x + CW() * 3.0, by + CH() * 0.5, S(), TXT);
-            let vw = 14.0 * CW();
+            let vw = 18.0 * CW();
             let vx = x + cols as f32 * CW() - vw - CW() * 3.0;
             let left = Rect::new(vx, by, CW() * 2.5, CH() * 2.0);
             let right = Rect::new(vx + vw - CW() * 2.5, by, CW() * 2.5, CH() * 2.0);
             button(gfx, left, "<", left.contains(vec2(mx, my)), FRAME);
             button(gfx, right, ">", right.contains(vec2(mx, my)), FRAME);
             let v = val.clone();
-            gfx.text(&v, vx + (vw - gfx.measure(&v, S())) * 0.5, by + CH() * 0.5, S(), GOLD);
+            let vs = if gfx.measure(&v, S()) > vw - CW() * 5.5 { SMALL() } else { S() };
+            gfx.text(&v, vx + (vw - gfx.measure(&v, vs)) * 0.5, by + CH() * 0.5, vs, GOLD);
             let (l, r) = match which {
                 0 => (Btn::MapW(-1), Btn::MapW(1)),
                 1 => (Btn::MapH(-1), Btn::MapH(1)),
+                3 => (Btn::Land, Btn::Land),
                 _ => (Btn::Difficulty(-1), Btn::Difficulty(1)),
             };
             self.buttons.push((left, l));
@@ -1183,14 +1191,14 @@ impl Menu {
         let area = (s.map_w * s.map_h) as f32 / 4096.0;
         let portals = (area.round() as usize).max(1);
         let info = trf("newgame.info", &[portals.to_string(), (portals - 1).to_string()]);
-        gfx.text(&info, x + CW() * 3.0, y + CH() * 10.0, S(), DIM);
+        gfx.text(&info, x + CW() * 3.0, y + CH() * 12.5, S(), DIM);
         let opp = tr(if s.map_w * s.map_h > 128 * 128 { "newgame.opponents2" } else { "newgame.opponents1" });
         let maxc = (cols - 6) as usize;
         for (k, l) in wrap(&opp, maxc).iter().take(2).enumerate() {
-            gfx.text(l, x + CW() * 3.0, y + CH() * (11.0 + k as f32), S(), DIM);
+            gfx.text(l, x + CW() * 3.0, y + CH() * (13.5 + k as f32), S(), DIM);
         }
         let w = (cols - 6) as f32 * CW();
-        self.column(gfx, x + CW() * 3.0, y + CH() * 14.0, w, &[(Btn::Start, tr("newgame.start")), (Btn::Back, tr("menu.back"))]);
+        self.column(gfx, x + CW() * 3.0, y + CH() * 16.5, w, &[(Btn::Start, tr("newgame.start")), (Btn::Back, tr("menu.back"))]);
     }
 
     fn draw_pause(&mut self, gfx: &Gfx) {