diff --git a/Mage.Client/src/main/resources/avatars/special/10.gif b/Mage.Client/src/main/resources/avatars/special/10.gif new file mode 100644 index 00000000000..fa987dc17e3 Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/special/10.gif differ diff --git a/Mage.Client/src/main/resources/avatars/special/3.gif b/Mage.Client/src/main/resources/avatars/special/4.gif similarity index 100% rename from Mage.Client/src/main/resources/avatars/special/3.gif rename to Mage.Client/src/main/resources/avatars/special/4.gif diff --git a/Mage.Client/src/main/resources/avatars/special/6.gif b/Mage.Client/src/main/resources/avatars/special/6.gif new file mode 100644 index 00000000000..daf827e350a Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/special/6.gif differ diff --git a/Mage.Client/src/main/resources/avatars/special/8.gif b/Mage.Client/src/main/resources/avatars/special/8.gif new file mode 100644 index 00000000000..c9bf4f69ec5 Binary files /dev/null and b/Mage.Client/src/main/resources/avatars/special/8.gif differ diff --git a/Mage.Common/src/mage/view/UserDataView.java b/Mage.Common/src/mage/view/UserDataView.java new file mode 100644 index 00000000000..546fa5e0d99 --- /dev/null +++ b/Mage.Common/src/mage/view/UserDataView.java @@ -0,0 +1,29 @@ +package mage.view; + +import mage.players.net.UserData; + +import java.io.Serializable; + +/** + * Transfer object for {@link mage.players.net.UserData} + * + * @author ayrat + */ +public class UserDataView implements Serializable { + + protected int avatarId; + protected int userGroup; + + public UserDataView(int avatarId) { + this.avatarId = avatarId; + } + + public UserDataView(UserData userData) { + this.avatarId = userData.getAvatarId(); + this.userGroup = userData.getGroupId(); + } + + public int getAvatarId() { + return avatarId; + } +} diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index 0b420e540a9..c0f51e5642e 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -112,7 +112,13 @@ public class Session { } else if (userName.equals("i_no_k")) { userData.setAvatarId(1002); } else if (userName.equals("Askael")) { - userData.setAvatarId(1003); + userData.setAvatarId(1004); + } else if (userName.equals("North")) { + userData.setAvatarId(1006); + } else if (userName.equals("BetaSteward")) { + userData.setAvatarId(1008); + } else if (userName.equals("Arching")) { + userData.setAvatarId(1010); } } diff --git a/Mage/src/mage/players/net/UserGroup.java b/Mage/src/mage/players/net/UserGroup.java index fe3c78b753c..75589dee325 100644 --- a/Mage/src/mage/players/net/UserGroup.java +++ b/Mage/src/mage/players/net/UserGroup.java @@ -8,7 +8,8 @@ public enum UserGroup { COMPUTER(0), PLAYER(1), MAGE(3), - ADMIN(7); + ADMIN(7), + OWNER(15); private int groupId;