Tigran 4 лет назад
Родитель
Сommit
ebe9fab38a

+ 1 - 1
MafiaTelegramBot.sln.DotSettings.user

@@ -6,7 +6,7 @@
 	
 	
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fstrings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fstrings/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002Fstrings/@EntryIndexedValue">True</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean>

+ 1 - 1
MafiaTelegramBot/Game/GameRooms/GameRoom.cs

@@ -121,7 +121,7 @@ namespace MafiaTelegramBot.Game.GameRooms
                     var user = _turnOrder.Dequeue();
                     var value = random.Next(roles.Count);
                     var next = roles.GetAndRemove(value);
-                    user.CurrentRole = (Role.GetNewRoleInstance(next));
+                    user.CurrentRole = Role.GetNewRoleInstance(next);
                     _turnOrder.Enqueue(user);
                 }
             });

+ 10 - 0
MafiaTelegramBot/Resources/Roles.cs

@@ -9,6 +9,16 @@ namespace MafiaTelegramBot.Resources
         Cop, //Комиссар
         Villager, //Мирный житель
         Hooker, //Проститутка
+        Elder, //Старейшина
+        Werewolf, //Оборотень
+        Journalist, //Журналист
+        Detective, //Детектив
+        Dame, //Дама
+        Parasite, //Паразит
+        Lawyer, //Адвокат
+        Fool, //Дурачок
+        Necromancer, //Некромант
+        Bodyguard, //Телохранитель
         None
     }
 }

+ 60 - 0
MafiaTelegramBot/Resources/roles.Designer.cs

@@ -86,5 +86,65 @@ namespace MafiaTelegramBot.Resources {
                 return ResourceManager.GetString("None", resourceCulture);
             }
         }
+        
+        internal static string Elder {
+            get {
+                return ResourceManager.GetString("Elder", resourceCulture);
+            }
+        }
+        
+        internal static string Werewolf {
+            get {
+                return ResourceManager.GetString("Werewolf", resourceCulture);
+            }
+        }
+        
+        internal static string Journalist {
+            get {
+                return ResourceManager.GetString("Journalist", resourceCulture);
+            }
+        }
+        
+        internal static string Detective {
+            get {
+                return ResourceManager.GetString("Detective", resourceCulture);
+            }
+        }
+        
+        internal static string Dame {
+            get {
+                return ResourceManager.GetString("Dame", resourceCulture);
+            }
+        }
+        
+        internal static string Parasite {
+            get {
+                return ResourceManager.GetString("Parasite", resourceCulture);
+            }
+        }
+        
+        internal static string Lawyer {
+            get {
+                return ResourceManager.GetString("Lawyer", resourceCulture);
+            }
+        }
+        
+        internal static string Fool {
+            get {
+                return ResourceManager.GetString("Fool", resourceCulture);
+            }
+        }
+        
+        internal static string Necromancer {
+            get {
+                return ResourceManager.GetString("Necromancer", resourceCulture);
+            }
+        }
+        
+        internal static string Bodyguard {
+            get {
+                return ResourceManager.GetString("Bodyguard", resourceCulture);
+            }
+        }
     }
 }

+ 30 - 0
MafiaTelegramBot/Resources/roles.resx

@@ -39,4 +39,34 @@
     <data name="None" xml:space="preserve">
         <value>Нет роли</value>
     </data>
+    <data name="Elder" xml:space="preserve">
+        <value>Старейшина</value>
+    </data>
+    <data name="Werewolf" xml:space="preserve">
+        <value>Оборотень</value>
+    </data>
+    <data name="Journalist" xml:space="preserve">
+        <value>Журналист</value>
+    </data>
+    <data name="Detective" xml:space="preserve">
+        <value>Детектив</value>
+    </data>
+    <data name="Dame" xml:space="preserve">
+        <value>Дама</value>
+    </data>
+    <data name="Parasite" xml:space="preserve">
+        <value>Паразит</value>
+    </data>
+    <data name="Lawyer" xml:space="preserve">
+        <value>Адвокат</value>
+    </data>
+    <data name="Fool" xml:space="preserve">
+        <value>Дурачок</value>
+    </data>
+    <data name="Necromancer" xml:space="preserve">
+        <value>Некромант</value>
+    </data>
+    <data name="Bodyguard" xml:space="preserve">
+        <value>Телохранитель</value>
+    </data>
 </root>