Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
dotnet: [ '2.1', '3.1.x', '5.0.x' ]


steps:
- uses: actions/checkout@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 2.1.802
dotnet-version: ${{ matrix.dotnet-version }}
- name: Build with dotnet
run: |
cd CourseApp
Expand Down
26 changes: 26 additions & 0 deletions .vscode/launch.json
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"
}
]
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
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"
}
]
}
2 changes: 1 addition & 1 deletion CourseApp.Tests/CourseApp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp5</TargetFramework>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions CourseApp.Tests/DemoTest.cs

This file was deleted.

18 changes: 18 additions & 0 deletions CourseApp.Tests/PistolTest.cs
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);
}
}
}
46 changes: 46 additions & 0 deletions CourseApp.Tests/WeaponTest.cs
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());
}
}
}
2 changes: 1 addition & 1 deletion CourseApp/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/netcoreapp2.1/CourseApp.dll",
"program": "${workspaceFolder}/bin/Debug/netcoreapp5/CourseApp.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "internalConsole",
Expand Down
2 changes: 1 addition & 1 deletion CourseApp/CourseApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp5</TargetFramework>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>

Expand Down
11 changes: 11 additions & 0 deletions CourseApp/Interfaces/IPlayer.cs
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; }
}
}
33 changes: 33 additions & 0 deletions CourseApp/Pistol.cs
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--;
Copy link
Copy Markdown
Contributor

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?

return "Sound";
}
}
}
24 changes: 14 additions & 10 deletions CourseApp/Program.cs
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();
}
}
}
}
}
}
26 changes: 26 additions & 0 deletions CourseApp/RPGsaga/Archer.cs
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}";
}
}
}
25 changes: 25 additions & 0 deletions CourseApp/RPGsaga/Knight.cs
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}";
}
}
}
12 changes: 12 additions & 0 deletions CourseApp/RPGsaga/Logger.cs
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);
}
}
}
Loading