cleanup, changelog, small bugfixes

fmt
fix rebase
fmt

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Campfire resting heal
 - Initial support for game plugins, both server-side and client-side
 - Reflective LoD water
+- Map indicators for group members
 
 ### Changed
 

common/sys/src/agent.rs

@@ -1474,7 +1474,7 @@ impl<'a> System<'a> for Sys {
         for (_invite, /*alignment,*/ agent, controller) in
             (&invites, /*&alignments,*/ &mut agents, &mut controllers).join()
         {
-            let accept = false; // set back to "matches!(alignment, Alignment::Npc)" when we got better NPC recruitment mechanics
+            let accept = true; // set back to "matches!(alignment, Alignment::Npc)" when we got better NPC recruitment mechanics
             if accept {
                 // Clear agent comp
                 *agent = Agent::default();

voxygen/src/hud/img_ids.rs

@@ -26,18 +26,6 @@ image_ids! {
         flower: "voxygen.element.icons.item_flower",
         grass: "voxygen.element.icons.item_grass",
 
-        // Checkboxes and Radio buttons
-        check: "voxygen.element.buttons.radio.inactive",
-        check_mo: "voxygen.element.buttons.radio.inactive_hover",
-        check_press: "voxygen.element.buttons.radio.press",
-        check_checked: "voxygen.element.buttons.radio.active",
-        check_checked_mo: "voxygen.element.buttons.radio.hover",
-        checkbox: "voxygen.element.buttons.checkbox.inactive",
-        checkbox_mo: "voxygen.element.buttons.checkbox.inactive_hover",
-        checkbox_press: "voxygen.element.buttons.checkbox.press",
-        checkbox_checked: "voxygen.element.buttons.checkbox.active",
-        checkbox_checked_mo: "voxygen.element.buttons.checkbox.hover",
-
         // Charwindow
         xp_charwindow: "voxygen.element.frames.xp_charwindow",
         divider: "voxygen.element.frames.divider_charwindow",
@@ -53,6 +41,19 @@ image_ids! {
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
         <ImageGraphic>
+
+        // Checkboxes and Radio buttons
+        check: "voxygen.element.buttons.radio.inactive",
+        check_mo: "voxygen.element.buttons.radio.inactive_hover",
+        check_press: "voxygen.element.buttons.radio.press",
+        check_checked: "voxygen.element.buttons.radio.active",
+        check_checked_mo: "voxygen.element.buttons.radio.hover",
+        checkbox: "voxygen.element.buttons.checkbox.inactive",
+        checkbox_mo: "voxygen.element.buttons.checkbox.inactive_hover",
+        checkbox_press: "voxygen.element.buttons.checkbox.press",
+        checkbox_checked: "voxygen.element.buttons.checkbox.active",
+        checkbox_checked_mo: "voxygen.element.buttons.checkbox.hover",
+
         // Selection Frame
         selection: "voxygen.element.frames.selection",
         selection_hover: "voxygen.element.frames.selection_hover",
@@ -180,7 +181,6 @@ image_ids! {
         indicator_mmap: "voxygen.element.buttons.indicator_mmap",
         indicator_map_overlay: "voxygen.element.buttons.indicator_mmap_small",
         indicator_group: "voxygen.element.map.group_indicator",
-        indicator_group_hover: "voxygen.element.map.group_indicator_hover",
         indicator_group_up: "voxygen.element.map.group_indicator_arrow_up",
         indicator_group_down: "voxygen.element.map.group_indicator_arrow_down",
 

voxygen/src/hud/map.rs

@@ -9,9 +9,8 @@ use crate::{
     GlobalState,
 };
 use client::{self, Client};
-use common::{
-    comp, comp::group::Role, msg::world_msg::SiteKind, terrain::TerrainChunkSize, vol::RectVolSize,
-};
+use common::{comp, comp::group::Role, terrain::TerrainChunkSize, vol::RectVolSize};
+use common_net::msg::world_msg::SiteKind;
 use conrod_core::{
     color, position,
     widget::{self, Button, Image, Rectangle, Text},
@@ -661,7 +660,7 @@ impl<'a> Widget for Map<'a> {
         //let in_group = !group_members.is_empty();
         let uid_allocator = client_state
             .ecs()
-            .read_resource::<common::sync::UidAllocator>();
+            .read_resource::<common_net::sync::UidAllocator>();
         if state.ids.member_indicators.len() < group_size {
             state.update(|s| {
                 s.ids
@@ -673,7 +672,11 @@ impl<'a> Widget for Map<'a> {
             let entity = uid_allocator.retrieve_entity_internal(uid.into());
             let member_pos = entity.and_then(|entity| member_pos.get(entity));
             let stats = entity.and_then(|entity| stats.get(entity));
-            let name= if let Some(stats) = stats {stats.name.to_string()} else {"".to_string()};                      
+            let name = if let Some(stats) = stats {
+                stats.name.to_string()
+            } else {
+                "".to_string()
+            };
 
             if let Some(member_pos) = member_pos {
                 // Site pos in world coordinates relative to the player
@@ -709,13 +712,7 @@ impl<'a> Widget for Map<'a> {
                 )
                 .w_h(20.0 * factor, 20.0 * factor)
                 .floating(true)
-                    .with_tooltip(
-                        self.tooltip_manager,
-                        &name,
-                        "",
-                        &site_tooltip,
-                        TEXT_COLOR,
-                    )
+                .with_tooltip(self.tooltip_manager, &name, "", &site_tooltip, TEXT_COLOR)
                 .set(state.ids.member_indicators[i], ui);
             }
         }

voxygen/src/hud/minimap.rs

@@ -5,7 +5,8 @@ use super::{
 };
 use crate::ui::{fonts::Fonts, img_ids};
 use client::{self, Client};
-use common::{comp, comp::group::Role, msg::world_msg::SiteKind, terrain::TerrainChunkSize, vol::RectVolSize};
+use common::{comp, comp::group::Role, terrain::TerrainChunkSize, vol::RectVolSize};
+use common_net::msg::world_msg::SiteKind;
 use conrod_core::{
     color, position,
     widget::{self, Button, Image, Rectangle, Text},
@@ -311,7 +312,7 @@ impl<'a> Widget for MiniMap<'a> {
             //let in_group = !group_members.is_empty();
             let uid_allocator = client_state
                 .ecs()
-            .read_resource::<common::sync::UidAllocator>();
+                .read_resource::<common_net::sync::UidAllocator>();
             if state.ids.member_indicators.len() < group_size {
                 state.update(|s| {
                     s.ids

voxygen/src/hud/skillbar.rs

@@ -607,7 +607,7 @@ impl<'a> Widget for Skillbar<'a> {
             .fabricate(hotbar::Slot::Four, [40.0; 2])
             .filled_slot(self.imgs.inv_slot)
             .right_from(state.ids.slot3, 0.0);
-        if let Some((title, desc)) = tooltip_text(hotbar::Slot::Three) {
+        if let Some((title, desc)) = tooltip_text(hotbar::Slot::Four) {
             slot.with_tooltip(self.tooltip_manager, title, desc, &item_tooltip, TEXT_COLOR)
                 .set(state.ids.slot4, ui);
         } else {
@@ -618,7 +618,7 @@ impl<'a> Widget for Skillbar<'a> {
             .fabricate(hotbar::Slot::Five, [40.0; 2])
             .filled_slot(self.imgs.inv_slot)
             .right_from(state.ids.slot4, 0.0);
-        if let Some((title, desc)) = tooltip_text(hotbar::Slot::Three) {
+        if let Some((title, desc)) = tooltip_text(hotbar::Slot::Five) {
             slot.with_tooltip(self.tooltip_manager, title, desc, &item_tooltip, TEXT_COLOR)
                 .set(state.ids.slot5, ui);
         } else {