Add icon for +v (voice) on players to facilitate medals functionality for RA1 (CnCNet#851)

* Update AllianceHolder.cs

* Update AllianceHolder.cs

* Clienttype=RA

* Update DXMainClient/Domain/Multiplayer/AllianceHolder.cs

Co-authored-by: Kerbiter <[email protected]>

* Update AllianceHolder.cs

* removed space (line 117)

* Reword the comment by Copilot

* Fix incorrect allyHouseId for other games

* Correct the indent

* Correct the indent

* Adjust for the fourth game type

* Add steam init for red alert

Co-authored-by: Kerbiter <[email protected]>

* Quick Test. Ignore.

* Update ChannelUser.cs

* Update ChannelUser.cs

* Update README.md

* Create medal.png.png

* Edits.

unhardcoded medalIcon size, replaced HasMedal by HasVoice .

* Edits .

persistence of medal , (+v) has the same logic of (+o).
Medalist (HasVoice) is under "Admin" in the Player list .

* Update CnCNetManager.cs

* Update CnCNetManager.cs

* Update CnCNetManager.cs

* Replace "medal" and "Medal" with "voice" and "Voice" .

* voice.png

* Update ChannelUser.cs

* Update PlayerListBox.cs

if voice.png isn't found skip drawing.

* fix the missing texture case

* clean up the branch code before merging

---------

Co-authored-by: Kerbiter <[email protected]>
Co-authored-by: SadPencil <[email protected]>

Author: 3 people

DXMainClient/DXGUI/Multiplayer/PlayerListBox.cs

@@ -25,9 +25,9 @@ public class PlayerListBox : XNAListBox
 
         private Texture2D adminGameIcon;
         private Texture2D unknownGameIcon;
-        private Texture2D badgeGameIcon;
         private Texture2D friendIcon;
         private Texture2D ignoreIcon;
+        private Texture2D? voiceIcon;
 
         private GameCollection gameCollection;
 
@@ -45,7 +45,10 @@ public PlayerListBox(WindowManager windowManager, GameCollection gameCollection)
             unknownGameIcon = AssetLoader.TextureFromImage(Image.Load(unknownIconStream));
             friendIcon = AssetLoader.LoadTexture("friendicon.png");
             ignoreIcon = AssetLoader.LoadTexture("ignoreicon.png");
-            badgeGameIcon = AssetLoader.LoadTexture("Badges/badge.png");
+
+            const string voiceIconName = "voiceicon.png";
+            if (AssetLoader.AssetExists(voiceIconName))
+                voiceIcon = AssetLoader.LoadTexture(voiceIconName);
         }
 
         public void AddUser(ChannelUser user)
@@ -119,14 +122,14 @@ public override void Draw(GameTime gameTime)
                     x += ignoreIcon.Width + MARGIN;
                 }
 
-                // Badge Icon - coming soon
-                /*
-                Renderer.DrawTexture(badgeGameIcon,
-                    new Rectangle(windowRectangle.X + x, windowRectangle.Y + height,
-                    badgeGameIcon.Width, badgeGameIcon.Height), Color.White);
+                // Voice Icon
+                if (user.HasVoice && voiceIcon != null)
+                {
+                    DrawTexture(voiceIcon,
+                        new Rectangle(x, height, voiceIcon.Width, voiceIcon.Height), Color.White);
 
-                x += badgeGameIcon.Width + margin;
-                */
+                    x += voiceIcon.Width + MARGIN;
+                }
 
                 // Player Name
                 string name = user.IsAdmin ? user.IRCUser.Name + " " + "(Admin)".L10N("Client:Main:AdminSuffix") : user.IRCUser.Name;
@@ -166,4 +169,4 @@ private void UpdateItemInfo(ChannelUser user, XNAListBoxItem item)
             }
         }
     }
-}
+}

DXMainClient/Online/ChannelUser.cs

@@ -17,17 +17,22 @@ public ChannelUser(IRCUser ircUser)
         public bool IsAdmin { get; set; }
 
         public bool IsFriend { get; set; }
+        
+        public bool HasVoice => IRCUser.HasVoice;
 
         public static int ChannelUserComparison(ChannelUser u1, ChannelUser u2)
         {
             if (u1.IsAdmin != u2.IsAdmin)
                 return u1.IsAdmin ? -1 : 1;
+
+            if (u1.HasVoice != u2.HasVoice)
+                return u1.HasVoice ? -1 : 1;
 
             if (u1.IsFriend != u2.IsFriend)
                 return u1.IsFriend ? -1 : 1;
-            
+
             return string.Compare(u1.IRCUser.Name, u2.IRCUser.Name, StringComparison.InvariantCultureIgnoreCase);
 
         }
     }
-}
+}

DXMainClient/Online/CnCNetManager.cs

@@ -284,6 +284,17 @@ private void ApplyChannelModes(Channel channel, string modeString, List<string>
                                 break;
                             user.IsAdmin = addMode;
                             break;
+
+                        // Add/remove voice status on user.
+                        case 'v':
+                            if (parameterCount >= modeParameters.Count)
+                                break;
+                            string vParam = modeParameters[parameterCount++];
+                            ChannelUser vUser = channel.Users.Find(vParam);
+                            if (vUser == null)
+                                break;
+                            vUser.IRCUser.HasVoice = addMode;
+                            break;
                     }
                 }
             }
@@ -739,14 +750,18 @@ private void DoUserListReceived(string channelName, string[] userList)
             {
                 string name = userName;
                 bool isAdmin = false;
+                bool hasVoice = false;
 
                 if (userName.StartsWith("@"))
                 {
                     isAdmin = true;
                     name = userName.Substring(1);
                 }
                 else if (userName.StartsWith("+"))
+                {
+                    hasVoice = true;
                     name = userName.Substring(1);
+                }
 
                 // Check if we already know the IRC user from another channel
                 IRCUser ircUser = UserList.Find(u => u.Name == name);
@@ -762,6 +777,7 @@ private void DoUserListReceived(string channelName, string[] userList)
                 var channelUser = new ChannelUser(ircUser);
                 channelUser.IsAdmin = isAdmin;
                 channelUser.IsFriend = cncNetUserData.IsFriend(channelUser.IRCUser.Name);
+                channelUser.IRCUser.HasVoice = hasVoice;
 
                 channelUserList.Add(channelUser);
             }

DXMainClient/Online/IRCUser.cs

@@ -36,5 +36,6 @@ public object Clone()
 
         public bool IsFriend { get; set; }
         public bool IsIgnored { get; set; }
+        public bool HasVoice { get; set; }
     }
 }