From be2ed507acfb7287f9d752b9b27bfc811dd7c5c2 Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Mon, 11 Jan 2021 12:37:08 +0300 Subject: [PATCH 1/7] Not Full RPG --- RPG/Archer.cs | 12 ++++++++ RPG/Game.cs | 16 +++++++++++ RPG/Knight.cs | 12 ++++++++ RPG/Logger.cs | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ RPG/Mage.cs | 12 ++++++++ RPG/Player.cs | 33 ++++++++++++++++++++++ RPG/RPG.csproj | 23 ++++++++++++++++ 7 files changed, 182 insertions(+) create mode 100644 RPG/Archer.cs create mode 100644 RPG/Game.cs create mode 100644 RPG/Knight.cs create mode 100644 RPG/Logger.cs create mode 100644 RPG/Mage.cs create mode 100644 RPG/Player.cs create mode 100644 RPG/RPG.csproj diff --git a/RPG/Archer.cs b/RPG/Archer.cs new file mode 100644 index 0000000..174978a --- /dev/null +++ b/RPG/Archer.cs @@ -0,0 +1,12 @@ +using System; + +namespace RPG +{ + public class Archer : Player + { + public Archer(string name) + : base(name) + { + } + } +} \ No newline at end of file diff --git a/RPG/Game.cs b/RPG/Game.cs new file mode 100644 index 0000000..355a6b7 --- /dev/null +++ b/RPG/Game.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +namespace RPG +{ + public class Game + { + public static void Main(string[] args) + { + List players = new List(); + Logger arena = new Logger(); + arena.Fight(players); + Console.ReadLine(); + } + } +} diff --git a/RPG/Knight.cs b/RPG/Knight.cs new file mode 100644 index 0000000..e4df570 --- /dev/null +++ b/RPG/Knight.cs @@ -0,0 +1,12 @@ +using System; + +namespace RPG +{ + public class Knight : Player + { + public Knight(string name) + : base(name) + { + } + } +} \ No newline at end of file diff --git a/RPG/Logger.cs b/RPG/Logger.cs new file mode 100644 index 0000000..d35f991 --- /dev/null +++ b/RPG/Logger.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; + +namespace RPG +{ + public class Logger + { + public Logger() + { + } + + public void Fight(List players) + { + string[] namearr = new string[20] { "Coolz", "Jskonst", "MixerXXL", "Etogjesanya", "Exideinside", "Nugmate", "D1njo", "4i4a", "Bandi", "Incris", "Hroma", "MrColter", "Geralt", "Stalin", "Swearless", "Yanix", "Slava228", "Ciri", "Plotva", "Linys" }; + Console.WriteLine("Введите количество игроков:"); + int number = Convert.ToInt16(Console.ReadLine()); + for (int i = 0; i < number; i++) + { + Random rnd = new Random(); + string name = namearr[rnd.Next(0, 19)]; + Console.WriteLine($"Выберите класс игрока №{i + 1}\n 1.Рыцарь\n 2.Маг\n 3.Лучник"); + int classkey = Convert.ToInt16(Console.ReadLine()); + switch (classkey) + { + case 1: + Knight knight = new Knight($"{name} {i + 1}"); + players.Add(knight); + break; + case 2: + Mage mage = new Mage($"{name} {i + 1}"); + players.Add(mage); + break; + case 3: + Archer archer = new Archer($"{name} {i + 1}"); + players.Add(archer); + break; + default: + Console.WriteLine("Вы нажали неизвестную клавишу"); + break; + } + } + + for (int i = 0; i < players.Count; i = i + 2) + { + Console.WriteLine($"------------Да начнётся битва------------"); + int p1Health = players[i].GetHealth(); + int p2Health = players[i + 1].GetHealth(); + Console.WriteLine($"Игрок_1: {players[i].Name}, HP = {p1Health}"); + Console.WriteLine($"Игрок_2: {players[i + 1].Name}, HP = {p2Health}"); + while (p1Health > 0 && p2Health > 0) + { + p1Health = p1Health - players[i + 1].Damage; + Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); + Console.WriteLine($"HP {players[i].Name} = {p1Health}"); + if (p1Health > 0) + { + p2Health = p2Health - players[i].Damage; + Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); + Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); + } + else + { + Console.WriteLine($"-------{players[i + 1]} победил-----------"); + } + } + + if (p2Health <= 0) + { + Console.WriteLine($"-------{players[i]} победил-----------"); + } + } + } + } +} \ No newline at end of file diff --git a/RPG/Mage.cs b/RPG/Mage.cs new file mode 100644 index 0000000..de4691f --- /dev/null +++ b/RPG/Mage.cs @@ -0,0 +1,12 @@ +using System; + +namespace RPG +{ + public class Mage : Player + { + public Mage(string name) + : base(name) + { + } + } +} \ No newline at end of file diff --git a/RPG/Player.cs b/RPG/Player.cs new file mode 100644 index 0000000..3f6281f --- /dev/null +++ b/RPG/Player.cs @@ -0,0 +1,33 @@ +using System; + +namespace RPG +{ + public abstract class Player + { + private int health; + private int damage; + private Random rnd = new Random(); + + public Player(string name) + { + Name = name; + health = rnd.Next(50, 150); + damage = rnd.Next(20, 40); + Damage = damage; + } + + public string Name { get; set; } + + public int Damage { get; set; } + + public override string ToString() + { + return Name; + } + + public int GetHealth() + { + return health; + } + } +} \ No newline at end of file diff --git a/RPG/RPG.csproj b/RPG/RPG.csproj new file mode 100644 index 0000000..b244e47 --- /dev/null +++ b/RPG/RPG.csproj @@ -0,0 +1,23 @@ + + + + Exe + netcoreapp2.1 + True + 1573,1591,1701;1702;1705; + + + + + + + + ../_stylecop/stylecop.ruleset + true + + + + + + + From a96c1701d71908188fe48b6262a0db8ee7e4f254 Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Sat, 16 Jan 2021 13:17:01 +0300 Subject: [PATCH 2/7] RPG without abilities --- RPG/Game.cs | 3 +-- RPG/Logger.cs | 69 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/RPG/Game.cs b/RPG/Game.cs index 355a6b7..87b032f 100644 --- a/RPG/Game.cs +++ b/RPG/Game.cs @@ -7,9 +7,8 @@ public class Game { public static void Main(string[] args) { - List players = new List(); Logger arena = new Logger(); - arena.Fight(players); + arena.Fight(); Console.ReadLine(); } } diff --git a/RPG/Logger.cs b/RPG/Logger.cs index d35f991..caaf354 100644 --- a/RPG/Logger.cs +++ b/RPG/Logger.cs @@ -9,11 +9,17 @@ public Logger() { } - public void Fight(List players) + public void Fight() { + List players = new List(); string[] namearr = new string[20] { "Coolz", "Jskonst", "MixerXXL", "Etogjesanya", "Exideinside", "Nugmate", "D1njo", "4i4a", "Bandi", "Incris", "Hroma", "MrColter", "Geralt", "Stalin", "Swearless", "Yanix", "Slava228", "Ciri", "Plotva", "Linys" }; Console.WriteLine("Введите количество игроков:"); int number = Convert.ToInt16(Console.ReadLine()); + if (number % 2.0 != 0) + { + throw new InvalidOperationException("Количество игроков нечетное"); + } + for (int i = 0; i < number; i++) { Random rnd = new Random(); @@ -23,15 +29,15 @@ public void Fight(List players) switch (classkey) { case 1: - Knight knight = new Knight($"{name} {i + 1}"); + Knight knight = new Knight($"(Рыцарь) {name} {i + 1}"); players.Add(knight); break; case 2: - Mage mage = new Mage($"{name} {i + 1}"); + Mage mage = new Mage($"(Маг) {name} {i + 1}"); players.Add(mage); break; case 3: - Archer archer = new Archer($"{name} {i + 1}"); + Archer archer = new Archer($"(Лучник) {name} {i + 1}"); players.Add(archer); break; default: @@ -40,34 +46,49 @@ public void Fight(List players) } } - for (int i = 0; i < players.Count; i = i + 2) + int count = players.Count / 2; + int kon = 1; + for (int j = 0; j <= count; j = j + 2) { - Console.WriteLine($"------------Да начнётся битва------------"); - int p1Health = players[i].GetHealth(); - int p2Health = players[i + 1].GetHealth(); - Console.WriteLine($"Игрок_1: {players[i].Name}, HP = {p1Health}"); - Console.WriteLine($"Игрок_2: {players[i + 1].Name}, HP = {p2Health}"); - while (p1Health > 0 && p2Health > 0) + Console.WriteLine($"Кон {kon++}"); + for (int i = 0; i < players.Count; i++) { - p1Health = p1Health - players[i + 1].Damage; - Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); - Console.WriteLine($"HP {players[i].Name} = {p1Health}"); - if (p1Health > 0) + if (players.Count > i + 1) { - p2Health = p2Health - players[i].Damage; - Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); - Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); + Console.WriteLine($"------------Да начнётся битва------------"); + int p1Health = players[i].GetHealth(); + int p2Health = players[i + 1].GetHealth(); + Console.WriteLine($"Игрок_1: {players[i].Name}, HP = {p1Health}"); + Console.WriteLine($"Игрок_2: {players[i + 1].Name}, HP = {p2Health}"); + while (p1Health > 0 && p2Health > 0) + { + p1Health = p1Health - players[i + 1].Damage; + Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); + Console.WriteLine($"HP {players[i].Name} = {p1Health}"); + if (p1Health > 0) + { + p2Health = p2Health - players[i].Damage; + Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); + Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); + } + else + { + Console.WriteLine($"-------{players[i + 1]} победил-----------"); + players.RemoveAt(i); + } + } + + if (p2Health <= 0) + { + Console.WriteLine($"-------{players[i]} победил-----------"); + players.RemoveAt(i + 1); + } } else { - Console.WriteLine($"-------{players[i + 1]} победил-----------"); + j--; } } - - if (p2Health <= 0) - { - Console.WriteLine($"-------{players[i]} победил-----------"); - } } } } From 6154ad99750bc0d6ece5bb539c2a49759e4114cd Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Sat, 23 Jan 2021 13:23:51 +0300 Subject: [PATCH 3/7] Add Knight ability --- RPG/Knight.cs | 7 +++++++ RPG/Logger.cs | 40 +++++++++++++++++++++++++++------------- RPG/Player.cs | 13 +++++++++---- 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/RPG/Knight.cs b/RPG/Knight.cs index e4df570..0899d91 100644 --- a/RPG/Knight.cs +++ b/RPG/Knight.cs @@ -8,5 +8,12 @@ public Knight(string name) : base(name) { } + + public override double UseUlt() + { + Damage = Math.Floor(Damage * 1.3); + Console.WriteLine($"<<<<<<{Name} ультанул и добавил к своему урону +30%>>>>>>"); + return Damage; + } } } \ No newline at end of file diff --git a/RPG/Logger.cs b/RPG/Logger.cs index caaf354..74be490 100644 --- a/RPG/Logger.cs +++ b/RPG/Logger.cs @@ -11,6 +11,7 @@ public Logger() public void Fight() { + Random rnd = new Random(); List players = new List(); string[] namearr = new string[20] { "Coolz", "Jskonst", "MixerXXL", "Etogjesanya", "Exideinside", "Nugmate", "D1njo", "4i4a", "Bandi", "Incris", "Hroma", "MrColter", "Geralt", "Stalin", "Swearless", "Yanix", "Slava228", "Ciri", "Plotva", "Linys" }; Console.WriteLine("Введите количество игроков:"); @@ -22,27 +23,25 @@ public void Fight() for (int i = 0; i < number; i++) { - Random rnd = new Random(); string name = namearr[rnd.Next(0, 19)]; Console.WriteLine($"Выберите класс игрока №{i + 1}\n 1.Рыцарь\n 2.Маг\n 3.Лучник"); int classkey = Convert.ToInt16(Console.ReadLine()); switch (classkey) { case 1: - Knight knight = new Knight($"(Рыцарь) {name} {i + 1}"); + Knight knight = new Knight($"(Рыцарь) {name}({i + 1})"); players.Add(knight); break; case 2: - Mage mage = new Mage($"(Маг) {name} {i + 1}"); + Mage mage = new Mage($"(Маг) {name}({i + 1})"); players.Add(mage); break; case 3: - Archer archer = new Archer($"(Лучник) {name} {i + 1}"); + Archer archer = new Archer($"(Лучник) {name}({i + 1})"); players.Add(archer); break; default: - Console.WriteLine("Вы нажали неизвестную клавишу"); - break; + throw new InvalidOperationException("Вы нажали неизвестную клавишу"); } } @@ -50,37 +49,52 @@ public void Fight() int kon = 1; for (int j = 0; j <= count; j = j + 2) { - Console.WriteLine($"Кон {kon++}"); + Console.WriteLine($"Кон {kon++}\n"); for (int i = 0; i < players.Count; i++) { if (players.Count > i + 1) { Console.WriteLine($"------------Да начнётся битва------------"); - int p1Health = players[i].GetHealth(); - int p2Health = players[i + 1].GetHealth(); - Console.WriteLine($"Игрок_1: {players[i].Name}, HP = {p1Health}"); - Console.WriteLine($"Игрок_2: {players[i + 1].Name}, HP = {p2Health}"); + double p1Health = players[i].GetHealth(); + double p2Health = players[i + 1].GetHealth(); + Console.WriteLine($"Игрок_1: {players[i].Name}, HP = {p1Health}, Damage = {players[i].Damage}"); + Console.WriteLine($"Игрок_2: {players[i + 1].Name}, HP = {p2Health}, Damage = {players[i + 1].Damage}"); while (p1Health > 0 && p2Health > 0) { + var ult = rnd.Next(2) == 1; + double prevDamagep2 = players[i + 1].Damage; + if (ult) + { + players[i + 1].UseUlt(); + } + p1Health = p1Health - players[i + 1].Damage; Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); Console.WriteLine($"HP {players[i].Name} = {p1Health}"); + players[i + 1].Damage = prevDamagep2; if (p1Health > 0) { + double prevDamagep1 = players[i].Damage; + if (ult) + { + players[i].UseUlt(); + } + p2Health = p2Health - players[i].Damage; Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); + players[i].Damage = prevDamagep1; } else { - Console.WriteLine($"-------{players[i + 1]} победил-----------"); + Console.WriteLine($"-------{players[i + 1]} победил-----------\n"); players.RemoveAt(i); } } if (p2Health <= 0) { - Console.WriteLine($"-------{players[i]} победил-----------"); + Console.WriteLine($"-------{players[i]} победил-----------\n"); players.RemoveAt(i + 1); } } diff --git a/RPG/Player.cs b/RPG/Player.cs index 3f6281f..4708b6f 100644 --- a/RPG/Player.cs +++ b/RPG/Player.cs @@ -4,8 +4,8 @@ namespace RPG { public abstract class Player { - private int health; - private int damage; + private double health; + private double damage; private Random rnd = new Random(); public Player(string name) @@ -18,16 +18,21 @@ public Player(string name) public string Name { get; set; } - public int Damage { get; set; } + public double Damage { get; set; } public override string ToString() { return Name; } - public int GetHealth() + public double GetHealth() { return health; } + + public virtual double UseUlt() + { + return Damage; + } } } \ No newline at end of file From 1a170686be0f7213072373679a212004821182a6 Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Sat, 23 Jan 2021 18:54:35 +0300 Subject: [PATCH 4/7] Add Mage Ability --- RPG/Logger.cs | 44 ++++++++++++++++++++++++++++++++++---------- RPG/Mage.cs | 7 +++++++ RPG/Player.cs | 4 ++++ 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/RPG/Logger.cs b/RPG/Logger.cs index 74be490..05295ce 100644 --- a/RPG/Logger.cs +++ b/RPG/Logger.cs @@ -63,27 +63,51 @@ public void Fight() { var ult = rnd.Next(2) == 1; double prevDamagep2 = players[i + 1].Damage; - if (ult) + if (players[i].IsFrozen == 0) { - players[i + 1].UseUlt(); + if (ult) + { + players[i + 1].UseUlt(); + } + + if (players[i + 1].IsFrozen == 0) + { + p1Health = p1Health - players[i + 1].Damage; + Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); + Console.WriteLine($"HP {players[i].Name} = {p1Health}"); + } + } + else + { + Console.WriteLine($"{players[i + 1].Name} пропускает ход"); } - p1Health = p1Health - players[i + 1].Damage; - Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); - Console.WriteLine($"HP {players[i].Name} = {p1Health}"); players[i + 1].Damage = prevDamagep2; + players[i].IsFrozen = 0; if (p1Health > 0) { double prevDamagep1 = players[i].Damage; - if (ult) + if (players[i + 1].IsFrozen == 0) + { + if (ult) + { + players[i].UseUlt(); + } + + if (players[i].IsFrozen == 0) + { + p2Health = p2Health - players[i].Damage; + Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); + Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); + } + } + else { - players[i].UseUlt(); + Console.WriteLine($"{players[i].Name} пропускает ход"); } - p2Health = p2Health - players[i].Damage; - Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); - Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); players[i].Damage = prevDamagep1; + players[i + 1].IsFrozen = 0; } else { diff --git a/RPG/Mage.cs b/RPG/Mage.cs index de4691f..efffbc6 100644 --- a/RPG/Mage.cs +++ b/RPG/Mage.cs @@ -8,5 +8,12 @@ public Mage(string name) : base(name) { } + + public override double UseUlt() + { + IsFrozen = 1; + Console.WriteLine($"<<<<<<{Name} ультанул и заморозил соперника>>>>>>"); + return IsFrozen; + } } } \ No newline at end of file diff --git a/RPG/Player.cs b/RPG/Player.cs index 4708b6f..f723524 100644 --- a/RPG/Player.cs +++ b/RPG/Player.cs @@ -6,6 +6,7 @@ public abstract class Player { private double health; private double damage; + private double isFrozen = 0; private Random rnd = new Random(); public Player(string name) @@ -14,12 +15,15 @@ public Player(string name) health = rnd.Next(50, 150); damage = rnd.Next(20, 40); Damage = damage; + IsFrozen = isFrozen; } public string Name { get; set; } public double Damage { get; set; } + public double IsFrozen { get; set; } + public override string ToString() { return Name; From c75c224a034571a4b2b30911d6b354d8cff8ce14 Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Sun, 24 Jan 2021 13:08:10 +0300 Subject: [PATCH 5/7] Add Archer ability --- RPG/Archer.cs | 10 ++++++++++ RPG/Knight.cs | 2 +- RPG/Logger.cs | 38 ++++++++++++++++++++++++++++++++++---- RPG/Mage.cs | 2 +- RPG/Player.cs | 4 ++++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/RPG/Archer.cs b/RPG/Archer.cs index 174978a..fbd6640 100644 --- a/RPG/Archer.cs +++ b/RPG/Archer.cs @@ -8,5 +8,15 @@ public Archer(string name) : base(name) { } + + public override double UseUlt() + { + if (IsFire == 0) + { + IsFire = 1; + } + + return IsFire; + } } } \ No newline at end of file diff --git a/RPG/Knight.cs b/RPG/Knight.cs index 0899d91..bd451ed 100644 --- a/RPG/Knight.cs +++ b/RPG/Knight.cs @@ -12,7 +12,7 @@ public Knight(string name) public override double UseUlt() { Damage = Math.Floor(Damage * 1.3); - Console.WriteLine($"<<<<<<{Name} ультанул и добавил к своему урону +30%>>>>>>"); + Console.WriteLine($"<<<<<<{Name} добавил к своему урону +30%>>>>>>"); return Damage; } } diff --git a/RPG/Logger.cs b/RPG/Logger.cs index 05295ce..8e4a683 100644 --- a/RPG/Logger.cs +++ b/RPG/Logger.cs @@ -72,8 +72,23 @@ public void Fight() if (players[i + 1].IsFrozen == 0) { - p1Health = p1Health - players[i + 1].Damage; - Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); + if (players[i + 1].IsFire == 1) + { + Console.WriteLine($"<<<<<<{players[i + 1].Name} выпускает огненные стрелы в противника>>>>>>"); + players[i + 1].IsFire = 2; + } + else + { + p1Health = p1Health - players[i + 1].Damage; + Console.WriteLine($"{players[i + 1].Name} наносит урон {players[i + 1].Damage} противнику {players[i].Name}"); + } + + if (players[i + 1].IsFire == 2) + { + p1Health = p1Health - 2; + Console.WriteLine($"{players[i]} горит и теряет 2 HP"); + } + Console.WriteLine($"HP {players[i].Name} = {p1Health}"); } } @@ -96,8 +111,23 @@ public void Fight() if (players[i].IsFrozen == 0) { - p2Health = p2Health - players[i].Damage; - Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); + if (players[i].IsFire == 1) + { + Console.WriteLine($"<<<<<<{players[i].Name} выпускает огненные стрелы в противника>>>>>>"); + players[i].IsFire = 2; + } + else + { + p2Health = p2Health - players[i].Damage; + Console.WriteLine($"{players[i].Name} наносит урон {players[i].Damage} противнику {players[i + 1].Name}"); + } + + if (players[i].IsFire == 2) + { + p2Health = p2Health - 2; + Console.WriteLine($"{players[i + 1]} горит и теряет 2 HP"); + } + Console.WriteLine($"HP {players[i + 1].Name} = {p2Health}"); } } diff --git a/RPG/Mage.cs b/RPG/Mage.cs index efffbc6..4f0855d 100644 --- a/RPG/Mage.cs +++ b/RPG/Mage.cs @@ -12,7 +12,7 @@ public Mage(string name) public override double UseUlt() { IsFrozen = 1; - Console.WriteLine($"<<<<<<{Name} ультанул и заморозил соперника>>>>>>"); + Console.WriteLine($"<<<<<<{Name} заморозил противника>>>>>>"); return IsFrozen; } } diff --git a/RPG/Player.cs b/RPG/Player.cs index f723524..19f27cb 100644 --- a/RPG/Player.cs +++ b/RPG/Player.cs @@ -7,6 +7,7 @@ public abstract class Player private double health; private double damage; private double isFrozen = 0; + private double isFire = 0; private Random rnd = new Random(); public Player(string name) @@ -16,6 +17,7 @@ public Player(string name) damage = rnd.Next(20, 40); Damage = damage; IsFrozen = isFrozen; + IsFire = isFire; } public string Name { get; set; } @@ -24,6 +26,8 @@ public Player(string name) public double IsFrozen { get; set; } + public double IsFire { get; set; } + public override string ToString() { return Name; From de96cd8eb2c9bcf71ef1698afef9a2f919412e0f Mon Sep 17 00:00:00 2001 From: CoolzGH Date: Tue, 26 Jan 2021 15:02:32 +0300 Subject: [PATCH 6/7] static fix --- RPG/Game.cs | 3 +-- RPG/Logger.cs | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/RPG/Game.cs b/RPG/Game.cs index 87b032f..35f70d8 100644 --- a/RPG/Game.cs +++ b/RPG/Game.cs @@ -7,8 +7,7 @@ public class Game { public static void Main(string[] args) { - Logger arena = new Logger(); - arena.Fight(); + Logger.Fight(); Console.ReadLine(); } } diff --git a/RPG/Logger.cs b/RPG/Logger.cs index 8e4a683..5329961 100644 --- a/RPG/Logger.cs +++ b/RPG/Logger.cs @@ -5,11 +5,7 @@ namespace RPG { public class Logger { - public Logger() - { - } - - public void Fight() + public static void Fight() { Random rnd = new Random(); List players = new List(); From 44f2417ff3f77eb2bd88111ed1096a00cbc362ad Mon Sep 17 00:00:00 2001 From: stud Date: Wed, 10 Feb 2021 08:15:40 +0300 Subject: [PATCH 7/7] Site --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9239bd5..a664794 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Tprogramming_42_2020 - +>https://coolzgh.github.io/Website/ ## Knjazev Egor