format

Author: zeitlinger

client/src/advance_ui.rs

@@ -12,7 +12,7 @@ use server::resource_pile::AdvancePaymentOptions;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
 
 use crate::client_state::{ActiveDialog, ShownPlayer, StateUpdate};
-use crate::dialog_ui::{ dialog};
+use crate::dialog_ui::dialog;
 use crate::payment_ui::{payment_dialog, HasPayment, Payment, ResourcePayment};
 use crate::resource_ui::{new_resource_map, ResourceType};
 use crate::select_ui::HasCountSelectableObject;
@@ -119,7 +119,7 @@ pub fn show_generic_advance_menu(
                         return new_update(name);
                     }
                 }
-            } else  if p.has_advance(&name) { 
+            } else if p.has_advance(&name) {
                 ui.label(None, &name);
             }
         }

client/src/map_ui.rs

@@ -95,15 +95,15 @@ fn alpha(game: &Game, state: &State, pos: Position) -> f32 {
 fn draw_combat_arrow(c: &Combat) {
     let from = hex_ui::center(c.attacker_position);
     let to = hex_ui::center(c.defender_position);
-    let t = vec2(to.x, to.y);
-    let f = vec2(from.x, from.y);
-    let e = f.add(t.sub(f).mul(0.7));
-    draw_line(from.x, from.y, e.x, e.y, 10., BLACK);
-    let d = f.sub(t).normalize();
+    let to_vec = vec2(to.x, to.y);
+    let from_vec = vec2(from.x, from.y);
+    let end = from_vec.add(to_vec.sub(from_vec).mul(0.7));
+    draw_line(from.x, from.y, end.x, end.y, 10., BLACK);
+    let angle = from_vec.sub(to_vec).normalize();
     draw_triangle(
-        t.add(d.rotate(vec2(10., 0.))),
-        t.add(d.rotate(vec2(30., 30.))),
-        t.add(d.rotate(vec2(30., -30.))),
+        to_vec.add(angle.rotate(vec2(10., 0.))),
+        to_vec.add(angle.rotate(vec2(30., 30.))),
+        to_vec.add(angle.rotate(vec2(30., -30.))),
         BLACK,
     );
 }

client/src/move_ui.rs

@@ -45,7 +45,7 @@ pub fn move_units_dialog(game: &Game, sel: &MoveSelection, player: &ShownPlayer)
 }
 
 fn update_possible_destinations(game: &Game, mut sel: MoveSelection) -> StateUpdate {
-    if sel.units.is_empty() { 
+    if sel.units.is_empty() {
         sel.destinations.clear();
     } else if let Some(start) = sel.start {
         sel.destinations = possible_destinations(game, start, sel.player_index, &sel.units);