Add newspaper support to main_ui

Author: bluddy

src/rails_lib/backend/backend_d.ml

@@ -34,6 +34,7 @@ type ui_msg =
   | TrainArrival of train_arrival_msg
   | StockBroker of stock_broker_ui_msg
   | OpenStockBroker of {player: int}
+  | PriorityShipmentCanceled of {player: int}
   [@@deriving yojson]
 
 type t = {

src/rails_lib/backend/backend_low.ml

@@ -516,6 +516,12 @@ let handle_cycle v =
         else ui_msgs)
       else ui_msgs
     in
+    (* Cancel any expired priority shipments *)
+    let canceled = Player.cancel_priority v.players v.cycle v.year v.region
+      |> List.filter ((=) C.player) |> List.map (fun i -> PriorityShipmentCanceled{player=i})
+    in
+    let ui_msgs = canceled @ ui_msgs in
+
     (* adjust time *)
     v.time <- v.time + 1;
     let v = 

src/rails_lib/backend/player.ml

@@ -383,6 +383,25 @@ let incr_broker_timer player =
 
 let set_priority priority player = {player with priority}
 
+let check_cancel_priority player cycle year region =
+  (* Priority shipments are cancelled when the bonus is < 20 *)
+  match player.priority with
+  | None -> false
+  | Some pr_data ->
+     let bonus = Priority_shipment.compute_bonus pr_data cycle year region in
+     bonus < 20
+
+let cancel_priority players cycle year region =
+  (* Cancel priority and let us know if one was canceled *)
+  Array.foldi (fun acc i player ->
+    if check_cancel_priority player cycle year region then (
+      players.(i) <- {player with priority=None};
+      i::acc
+    ) else acc
+  )
+  []
+  players
+
 let update players idx f =
   let p = players.(idx) in
   let p' = f p in

src/rails_lib/ui/main_ui.ml

@@ -620,6 +620,13 @@ let handle_event (s:State.t) v (event:Event.t) =
         (fun x -> ModalMsgbox x)
         (fun _ () -> v, nobaction)
 
+    | Newspaper news_state ->
+        let v = match Newspaper.handle_event s news_state event with
+          | `Exit -> {v with mode=Normal}
+          | _ -> v
+        in
+        v, nobaction
+
     | BuildStation build_menu ->
         handle_modal_menu_events build_menu
         (fun x -> BuildStation x)
@@ -781,6 +788,10 @@ let handle_msgs (s:State.t) v ui_msgs =
       let state = Stock_broker.make s in
       {v with mode=Stock_broker state}
 
+    | Normal, PriorityShipmentCanceled{player} when player = C.player ->
+      let mode = Newspaper(Newspaper.make s Newspaper.LocalNews "Priority Shipment\nCANCELLED.\n" None) in
+      {v with mode}
+
     (* TODO: handle demand changed msg *)
     | _ -> v
   in
@@ -957,6 +968,9 @@ let render (win:R.window) (s:State.t) v =
     | ModalMsgbox modal ->
         render_mode modal.last;
         Menu.MsgBox.render win s modal.menu
+    | Newspaper news_state ->
+        render_main win s v;
+        Newspaper.render win s news_state
     | BuildStation modal ->
         render_main win s v;
         Menu.MsgBox.render win s modal.menu

src/rails_lib/ui/main_ui_d.ml

@@ -89,21 +89,22 @@ type ('state, 'menu_options, 'payload) modalmenu =
        2nd: type of choices from menu
        3rd: type of stored data
     *)
-and 'a mode =
+and 'state mode =
   | Normal
-  | ModalMsgbox of ('a, unit, unit) modalmenu
-  | BuildStation of ('a, Station.kind, unit) modalmenu
-  | BuildBridge of ('a, Bridge.t, Utils.msg) modalmenu
-  | BuildHighGrade of ('a, [`BuildTunnel | `BuildTrack], Utils.msg) modalmenu
-  | BuildTunnel of ('a, bool, Utils.msg * int) modalmenu
-  | SignalMenu of ('a, [`Normal|`Hold|`Proceed], int * int * Dir.t) modalmenu (* x,y,dir *)
+  | ModalMsgbox of ('state, unit, unit) modalmenu
+  | Newspaper of 'state Newspaper_d.t
+  | BuildStation of ('state, Station.kind, unit) modalmenu
+  | BuildBridge of ('state, Bridge.t, Utils.msg) modalmenu
+  | BuildHighGrade of ('state, [`BuildTunnel | `BuildTrack], Utils.msg) modalmenu
+  | BuildTunnel of ('state, bool, Utils.msg * int) modalmenu
+  | SignalMenu of ('state, [`Normal|`Hold|`Proceed], int * int * Dir.t) modalmenu (* x,y,dir *)
   | StationReport of int * int (* x, y *)
   | BuildTrain of [
     | `ChooseEngine
-    | `AddCars of 'a Build_train_d.addcars
+    | `AddCars of 'state Build_train_d.addcars
   ]
-  | TrainReport of 'a Train_report_d.t
-  | Stock_broker of 'a Stock_broker_d.t
+  | TrainReport of 'state Train_report_d.t
+  | Stock_broker of 'state Stock_broker_d.t
   | Balance_sheet of Balance_sheet_d.t
   | Accomplishments
   | Income_statement of Balance_sheet_d.t (* we use the stock part *)