fix voidwell counts

src/sources.rs

@@ -118,6 +118,8 @@ pub async fn voidwell(world: i32) -> Result<Population, ()> {
 
     #[derive(serde::Deserialize)]
     struct Root {
+        #[serde(rename = "onlineCharacters")]
+        pub online_characters: i32,
         #[serde(rename = "zoneStates")]
         pub zone_states: Vec<ZoneState>,
     }
@@ -152,29 +154,39 @@ pub async fn voidwell(world: i32) -> Result<Population, ()> {
         .await
         .unwrap();
 
-    Ok(Population {
+    let ns_avg: i32 = response
-        nc: response
+        .zone_states
+        .iter()
+        .map(|zone| zone.population.ns)
+        .sum::<i32>()
+        / 3;
+
+    let nc = response
         .zone_states
         .iter()
         .map(|zone| zone.population.nc)
-            .sum(),
+        .sum::<i32>()
-        tr: response
+        + ns_avg;
+
+    let tr = response
         .zone_states
         .iter()
         .map(|zone| zone.population.tr)
-            .sum(),
+        .sum::<i32>()
-        vs: response
+        + ns_avg;
+
+    let vs = response
         .zone_states
         .iter()
         .map(|zone| zone.population.vs)
-            .sum(),
+        .sum::<i32>()
-        total: response
+        + ns_avg;
-            .zone_states
+
-            .iter()
+    Ok(Population {
-            .map(|zone| {
+        nc,
-                zone.population.nc + zone.population.tr + zone.population.vs + zone.population.ns
+        tr,
-            })
+        vs,
-            .sum(),
+        total: response.online_characters,
     })
 }