Merge branch 'menu-tabs' into develop

2019-09-06 15:20:48 +10:00
parent b633820ca1 727c3ee6dc
commit 5da9c217d4
31 changed files with 703 additions and 413 deletions
@@ -53,16 +53,15 @@ pub fn invader_write(id: Uuid) -> Result<Uuid, Error> {
    colours.push("none".to_string());

    // add up to 100 for %
-    // [3] is the transparent colour
    let weights = [
        5,
        5,
        65,
-        25,
+        25, // the transparent colour
    ];
    let colour_dist = WeightedIndex::new(&weights)?;

-    write!(&mut svg, "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' viewBox='-250 -250 1000 1000' width='500' height='500'><g>")?;
+    write!(&mut svg, "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' viewBox='-250 -250 1000 1000' width='375' height='375'><g>")?;
    for i in 0..50 {
        let x = (i % 5) * 50;
        let y = (i / 5) * 50;