-
Notifications
You must be signed in to change notification settings - Fork 38
Maksim silin task 1 #46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
s1max
wants to merge
7
commits into
ISUCT:Maksim_Silin
Choose a base branch
from
s1max:Maksim_Silin
base: Maksim_Silin
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| // Use IntelliSense to find out which attributes exist for C# debugging | ||
| // Use hover for the description of the existing attributes | ||
| // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md | ||
| "name": ".NET Core Launch (console)", | ||
| "type": "coreclr", | ||
| "request": "launch", | ||
| "preLaunchTask": "build", | ||
| // If you have changed target frameworks, make sure to update the program path. | ||
| "program": "${workspaceFolder}/CourseApp/bin/Debug/netcoreapp2.1/CourseApp.dll", | ||
| "args": [], | ||
| "cwd": "${workspaceFolder}/CourseApp", | ||
| // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console | ||
| "console": "internalConsole", | ||
| "stopAtEntry": false | ||
| }, | ||
| { | ||
| "name": ".NET Core Attach", | ||
| "type": "coreclr", | ||
| "request": "attach" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "build", | ||
| "command": "dotnet", | ||
| "type": "process", | ||
| "args": [ | ||
| "build", | ||
| "${workspaceFolder}/CourseApp/CourseApp.csproj", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary" | ||
| ], | ||
| "problemMatcher": "$msCompile" | ||
| }, | ||
| { | ||
| "label": "publish", | ||
| "command": "dotnet", | ||
| "type": "process", | ||
| "args": [ | ||
| "publish", | ||
| "${workspaceFolder}/CourseApp/CourseApp.csproj", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary" | ||
| ], | ||
| "problemMatcher": "$msCompile" | ||
| }, | ||
| { | ||
| "label": "watch", | ||
| "command": "dotnet", | ||
| "type": "process", | ||
| "args": [ | ||
| "watch", | ||
| "run", | ||
| "${workspaceFolder}/CourseApp/CourseApp.csproj", | ||
| "/property:GenerateFullPaths=true", | ||
| "/consoleloggerparameters:NoSummary" | ||
| ], | ||
| "problemMatcher": "$msCompile" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System; | ||
| using Xunit; | ||
|
|
||
| namespace CourseApp.Tests | ||
| { | ||
| public class PistolTest | ||
| { | ||
| [Theory] | ||
| [InlineData( 1, 0)] | ||
| [InlineData( 2, 1)] | ||
| public void Test(int a, int exp) | ||
| { | ||
| Pistol actualResult = new Pistol(" ", 0, a); | ||
| actualResult.Shot(); | ||
| Assert.Equal(exp, actualResult.Clip); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| using System; | ||
| using Xunit; | ||
|
|
||
| namespace CourseApp.Tests | ||
| { | ||
| public class WeaponTest | ||
| { | ||
| [Theory] | ||
| [InlineData("Name", "Name")] | ||
| [InlineData(" ", " ")] | ||
| public void TestModel(string a, string exp) | ||
| { | ||
| Pistol actualResult = new Pistol(a); | ||
| Assert.Equal(exp, actualResult.Model); | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData(9, 9)] | ||
| [InlineData(-9, -9)] | ||
| public void TestCaliber(int a, int exp) | ||
| { | ||
| Pistol actualResult = new Pistol(" ", a); | ||
| Assert.Equal(exp, actualResult.Caliber); | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData(0, 0)] | ||
| [InlineData(-1, -1)] | ||
| [InlineData(8, 8)] | ||
| public void TestAge(int a, int exp) | ||
| { | ||
| Pistol actualResult = new Pistol(" ", 0, a); | ||
| Assert.Equal(exp, actualResult.Clip); | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData("Name", 9, 5, "model: Name caliber: 9 Clip: 5")] | ||
| [InlineData( " ", 0, -7, "model: caliber: 0 Clip: -7")] | ||
| public void TesteEditInf(string n, int b, int a, string exp) | ||
| { | ||
| Pistol actualResult = new Pistol(); | ||
| actualResult.EditInf(n, b, a); | ||
| Assert.Equal(exp, actualResult.ToString()); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| namespace CourseApp | ||
| { | ||
| public interface IPlayer | ||
| { | ||
| string Name { get; set; } | ||
|
|
||
| double Health { get; set; } | ||
|
|
||
| int Strength { get; set; } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| using System; | ||
|
|
||
| namespace CourseApp | ||
| { | ||
| public class Pistol : Weapon | ||
| { | ||
| public Pistol() | ||
| : base () | ||
| { | ||
| } | ||
|
|
||
| public Pistol(string newmodel) | ||
| : base(newmodel) | ||
| { | ||
| } | ||
|
|
||
| public Pistol(string newmodel, int newcaliber) | ||
| : base(newmodel, newcaliber) | ||
| { | ||
| } | ||
|
|
||
| public Pistol(string newmodel, int newcaliber, int newClip) | ||
| : base (newmodel, newcaliber, newClip) | ||
| { | ||
| } | ||
|
|
||
| public override string Shot() | ||
| { | ||
| Clip--; | ||
| return "Sound"; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| namespace CourseApp | ||
| { | ||
| using System; | ||
|
|
||
| public class Program | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| Console.WriteLine($"Hello world"); | ||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
||
| public class Program | ||
| { | ||
| public static void Main(string[] args) { | ||
| int participants = 0; | ||
| Game start = new Game(); | ||
| participants = start.StartTheTournament(participants); | ||
| Arena arena = new Arena(); | ||
| arena.Tour(participants); | ||
| Console.ReadLine(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| namespace CourseApp | ||
| { | ||
| using System; | ||
|
|
||
| public class Archer : Player | ||
| { | ||
| public Archer(string name, double health, int strength) | ||
| : base(name, health, strength) | ||
| { | ||
| ClassPlayer = "Лучник"; | ||
| UltimateName = "Ядовитая стрела"; | ||
| } | ||
|
|
||
| public override int Ultimate(Player player, Player rival) | ||
| { | ||
| UltimateDamage = 2; | ||
| Logger.LoggerOutput($"{ClassPlayer} {Name} использовал особую способность {UltimateName}!"); | ||
| return Strength += UltimateDamage; | ||
| } | ||
|
|
||
| public override string InfoOutput() | ||
| { | ||
| return $"Призвание: {ClassPlayer} ; Имя бойца: {Name} ; Здоровье бойца: {Health} ; Сила бойца {Strength}"; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| namespace CourseApp | ||
| { | ||
| using System; | ||
|
|
||
| public class Knight : Player | ||
| { | ||
| public Knight(string name, double health, int strength) | ||
| : base(name, health, strength) | ||
| { | ||
| ClassPlayer = "Рыцарь"; | ||
| UltimateName = "Удар"; | ||
| } | ||
|
|
||
| public override int Ultimate(Player player, Player rival) | ||
| { | ||
| Logger.LoggerOutput($"{ClassPlayer} {Name} использовал особую способность {UltimateName}!"); | ||
| return Strength = (int)(Strength * 1.3); | ||
| } | ||
|
|
||
| public override string InfoOutput() | ||
| { | ||
| return $"Призвание: {ClassPlayer} ; Имя бойца: {Name} ; Здоровье бойца: {Health} ; Сила бойца {Strength}"; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| namespace CourseApp | ||
| { | ||
| using System; | ||
|
|
||
| public class Logger | ||
| { | ||
| public static void LoggerOutput(string logger) | ||
| { | ||
| Console.WriteLine(logger); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we decrease it lower than 0?