Merge branch 'master' of https://github.com/HaQmUser/TProgramming_2024

ISUCT · Jan 17, 2025 · 89ad09f · 89ad09f
2 parents fc5f0da + ff79d71
commit 89ad09f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/rpgsaga/saga/eslint.config.mjs b/rpgsaga/saga/eslint.config.mjs
@@ -124,12 +124,20 @@ export default [{
         "@typescript-eslint/naming-convention": ["error", {
             selector: "default",
             format: ["camelCase"],
-        }, {
+        }, 
+        {
             selector: ["memberLike"],
             modifiers: ["private"],
             format: ["camelCase"],
             leadingUnderscore: "allow",
-        }, {
+        }, 
+        {
+            selector: ["memberLike"],
+            modifiers: ["protected"],
+            format: ["camelCase"],
+            leadingUnderscore: "allow",
+        },
+        {
             selector: ["enumMember", "variable"],
             format: ["camelCase", "PascalCase", "UPPER_CASE"],
         }, {

diff --git a/rpgsaga/saga/src/SuperClass.ts b/rpgsaga/saga/src/SuperClass.ts
@@ -3,9 +3,9 @@ import { Parrot } from './Classes/ParrotClass';
 import { Rabbit } from './Classes/RabbitClass';
 
 const animals: Animal[] = [new Parrot('Kez', 2, 'Blue', 'female', 10), new Rabbit('Nastya', 3, 'Brown', 'male', 1.5)];
-export function animalsOutput() {
-  animals.forEach(animal => {
-    console.log(animal.toString());
-    console.log(animal.sound());
-  });
-}
+export function animalsOutput(){
+animals.forEach(animal => {
+  console.log(animal.toString());
+  console.log(animal.sound());
+});
+}
diff --git a/rpgsaga/saga/src/index.ts b/rpgsaga/saga/src/index.ts
@@ -1,8 +1,4 @@
-import { animalsOutput } from './SuperClass';
-import { Tournament } from './rpg_saga/Tournament';
-
+import { animalsOutput } from "./SuperClass";
 console.log('Hello world');
 
-animalsOutput();
-const battle = new Tournament();
-battle.duel();
+animalsOutput()