Refactor and hook up maintenance

Author: bluddy

src/rails_lib/backend/backend_low.ml

@@ -682,6 +682,15 @@ let handle_cycle v =
     let trains, stations, player, tr_msgs = Train_update._update_all_trains v main_player in
 
     (* TODO: ai_routines *)
+    let player =
+      if v.cycle mod C.Cycles.periodic_maintenance = 0 then
+        if ((v.cycle / C.Cycles.periodic_maintenance) mod 2) = 0 then
+          Player.pay_station_maintenance v.stations player
+        else
+          Player.pay_train_maintenance player
+      else
+        player
+    in
 
     let stations, player, dev_state, active_station, pr_msgs =
       if v.cycle mod C.Cycles.rare_bgnd_events = 0 then

src/rails_lib/backend/player.ml

@@ -505,5 +505,7 @@ let pay_station_maintenance station_map v =
   in
   pay `StationMaintenance expense v
 
-
+let pay_train_maintenance v =
+  let expense = Trainmap.total_maintenance v.trains in
+  pay `TrainMaintenance expense v
 

src/rails_lib/backend/train.ml

@@ -560,7 +560,7 @@ let get_car_dir (v:'a t) i = (History.get v.history (i+1)).dir
 
 let get_engine_cost v = v.engine.price
 
-let get_num_of_cars v = List.length v.cars
+let num_of_cars v = List.length v.cars
 
 let holds_priority_shipment v = v.holds_priority_shipment
 

src/rails_lib/backend/trainmap.ml

@@ -108,6 +108,8 @@ let iteri (f: int -> ro Train.t -> unit) (v:t) = Vector.iteri f @@ _freeze_all v
 
 let fold (f: 'a -> ro Train.t -> 'a) (v:t) ~init = Vector.fold f init @@ _freeze_all v.trains
 
+let sum f v = fold (fun acc train -> acc + f train) ~init:0 v
+
 let foldi (f: int -> 'a -> ro Train.t -> 'a) (v:t) ~init = Vector.foldi f init @@ _freeze_all v.trains
 
 (* R/W *)
@@ -137,11 +139,14 @@ let find_ret_index (f:ro Train.t -> bool) (v:t) =
 let get_at_loc loc (v:t) =
   Hashtbl.find_opt v.tile_idx loc |> Option.get_or ~default:[]
 
-let total_engine_value (v:t) =
-  fold (fun acc train -> acc + Train.get_engine_cost train) v ~init:0
+let total_engine_value (v:t) = sum Train.get_engine_cost v
+
+let total_car_value (v:t) = C.car_cost * sum Train.num_of_cars v
 
-let total_car_value (v:t) =
-  C.car_cost * fold (fun acc train -> acc + Train.get_num_of_cars train) v ~init:0
+let total_maintenance (v:t) = sum (fun train ->
+  let num_cars = Train.num_of_cars train in
+  ((train.maintenance_cost / 2 + num_cars) / 2) + 1)
+  v
 
 let clear_priority_shipment v =
   (* Clear priority shipment holding for the given players *)

src/rails_lib/backend/trainmap.mli

@@ -40,5 +40,7 @@ val total_engine_value: t -> int
 
 val total_car_value: t -> int
 
+val total_maintenance: t -> int
+
 val clear_priority_shipment: t -> t