diff options
| author | eli_oat <hi@eli.li> | 2025-09-06 22:29:27 -0400 |
|---|---|---|
| committer | eli_oat <hi@eli.li> | 2025-09-06 22:29:27 -0400 |
| commit | 67f15b90297a33e9dded0307c611d7ead969a223 (patch) | |
| tree | 98f0dbf75610c9ad7d4a7abd2337631e04a12bd5 | |
| parent | 1d1a1da93e37280d661fde5e7778a4955ff2bdd9 (diff) | |
| download | the-lonely-wanderings-of-the-at-symbol-a-functional-requiem-for-imperative-lost-souls-beneath-the-casco-bay-moon-main.tar.gz | |
| -rw-r--r-- | lib/game.ml | 17 | ||||
| -rw-r--r-- | lib/view.ml | 67 |
2 files changed, 71 insertions, 13 deletions
diff --git a/lib/game.ml b/lib/game.ml index 124322b..26d82d8 100644 --- a/lib/game.ml +++ b/lib/game.ml @@ -421,8 +421,23 @@ let prepare_inventory_for_view (inventory : Items.item list) : (string * int * s (item_type_str, count, color, name) ) item_counts +(** Sort items by type for organized display *) +let sort_items_by_type (inventory : Items.item list) : Items.item list = + let compare_item_types a b = + let type_priority = function + | Items.Mushroom -> 0 + | Items.Lichen -> 1 + | Items.Salt -> 2 + | Items.Herb -> 3 + | Items.RewardItem _ -> 4 + in + compare (type_priority a.item_type) (type_priority b.item_type) + in + List.sort compare_item_types inventory + (** Prepare detailed inventory items for menu display *) let prepare_detailed_inventory (inventory : Items.item list) : (string * string * string) list = + let sorted_inventory = sort_items_by_type inventory in List.map (fun item -> let variant_name = Items.variant_name item.variant in let traits = Items.variant_traits item.variant in @@ -430,7 +445,7 @@ let prepare_detailed_inventory (inventory : Items.item list) : (string * string let trait_text = if trait_strings = [] then "" else " (" ^ String.concat ", " trait_strings ^ ")" in let color = Items.get_item_color item.item_type in (variant_name, trait_text, color) - ) inventory + ) sorted_inventory (** View - renders the current state using the View module *) let view (model : model) : unit = diff --git a/lib/view.ml b/lib/view.ml index c7763b6..f63f65c 100644 --- a/lib/view.ml +++ b/lib/view.ml @@ -73,7 +73,7 @@ let get_item_display_color = function | "Lichen" -> blue | "Salt" -> magenta | "Herb" -> yellow - | "NPC" -> yellow (* NPCs get yellow color to stand out *) + | "NPC" -> red (* NPCs get red color to match the player *) | _ -> reset (** Clear screen and position cursor at top-left *) @@ -117,12 +117,19 @@ let draw_inventory ~inventory_data = print_endline (color ^ Printf.sprintf "%d %s" count name ^ reset) ) inventory_data -(** Clean overworld view function - just shows the map *) -let view_overworld ~width ~height ~map ~entities ~player_pos ~player_symbol = +(** Clean overworld view function - shows map with status info *) +let view_overworld ~width ~height ~map ~entities ~player_pos ~player_symbol ~current_floor_num ~inventory_count = clear_screen (); draw_map ~width ~height ~map ~entities ~player_pos ~player_symbol; print_newline (); - print_endline (bold ^ "Controls: WASD/HJKL=Move, G=Pickup, I=Inventory, U=Undo, Q=Quit" ^ reset); + + (* Display floor and inventory info *) + print_endline (bold ^ Printf.sprintf "Floor: %d Inventory: %d items" current_floor_num inventory_count ^ reset); + print_newline (); + + (* Split controls into two lines to fit within play area width *) + print_endline (bold ^ "Controls: wasd/hjkl=Move, g=Pickup," ^ reset); + print_endline (bold ^ " i=Inventory, u=Undo, q=Quit" ^ reset); (* Ensure color is reset at the end *) print_string reset; @@ -131,8 +138,9 @@ let view_overworld ~width ~height ~map ~entities ~player_pos ~player_symbol = flush stdout (** Legacy main view function for compatibility *) -let view ~width ~height ~map ~entities ~player_pos ~player_symbol ~current_floor_num:_ ~player_health:_ ~player_attack:_ ~turn_count:_ ~inventory_data:_ = - view_overworld ~width ~height ~map ~entities ~player_pos ~player_symbol +let view ~width ~height ~map ~entities ~player_pos ~player_symbol ~current_floor_num ~player_health:_ ~player_attack:_ ~turn_count:_ ~inventory_data = + let inventory_count = List.fold_left (fun acc (_, count, _, _) -> acc + count) 0 inventory_data in + view_overworld ~width ~height ~map ~entities ~player_pos ~player_symbol ~current_floor_num ~inventory_count (** Encounter view functions *) @@ -231,6 +239,38 @@ let draw_encounter_resolution ~encounter_message ~rewards = (** Future view functions for different screens *) +(** Group items by type for display with headings *) +let group_items_by_category prepared_items = + let current_category = ref None in + let result = ref [] in + let item_counter = ref 1 in + + List.iter (fun (variant_name, trait_text, color) -> + (* Convert to string for category - safe string matching *) + let category = + if String.length color >= 5 then + match color with + | "\027[32m" -> "Mushrooms" (* green *) + | "\027[34m" -> "Lichens" (* blue *) + | "\027[35m" -> "Salts" (* magenta *) + | "\027[33m" -> "Herbs" (* yellow *) + | "\027[36m" -> "Special Items" (* cyan for reward items *) + | _ -> "Other Items" + else "Other Items" + in + + (match !current_category with + | Some cat when cat = category -> () + | _ -> + current_category := Some category; + result := (`Header category) :: !result); + + result := (`Item (!item_counter, variant_name, trait_text, color)) :: !result; + incr item_counter + ) prepared_items; + + List.rev !result + (** Draw inventory menu *) let draw_inventory_menu ~prepared_items = clear_screen (); @@ -241,12 +281,15 @@ let draw_inventory_menu ~prepared_items = print_endline "Your inventory is empty."; print_newline () ) else ( - print_endline "Your items:"; - print_newline (); - List.iteri (fun i (variant_name, trait_text, color) -> - print_endline (Printf.sprintf "%s%d. %s%s%s" - color (i + 1) variant_name trait_text reset) - ) prepared_items; + let grouped_items = group_items_by_category prepared_items in + List.iter (fun item -> + match item with + | `Header category_name -> + print_endline (bold ^ category_name ^ ":" ^ reset); + | `Item (num, variant_name, trait_text, color) -> + print_endline (Printf.sprintf "%s %d. %s%s%s" + color num variant_name trait_text reset) + ) grouped_items; print_newline () ); |