fix: ai system

src/global.d.ts

@@ -14,6 +14,7 @@ interface Сharacter {
 
 interface Enemy extends Сharacter { 
     ai?: boolean;
+    type: 'zombie' | 'flyguy' | 'soldier' | 'commando' | 'tank' | 'slayer'
     sprite: string;
     radius: number;
 }

src/levels/level_1.ts

@@ -21,28 +21,35 @@ const level: Level = {
     5: "DOOR_1E",
   },
   player: {
-    x: 1.5,
+    x: 17.5,
     y: 2.5,
-    angle: 0,
+    angle: 180,
     health: 100,
   },
   enemies: [
     {
+      ai: true,
+      type: 'soldier',
       sprite: 'soldier',
       health: 0,
-      angle: 10,
-      x: 18.5, 
+      angle: 180,
+      x: 14.5,
+//      x: 18.5, 
       y: 1.5,
       radius: 0.5,
     },
+    /*
     {
+      ai: true,
+      type: 'soldier',
       sprite: 'soldier',
       health: 0,
-      angle: 10,
+      angle: 180,
       x: 18.5, 
       y: 3.5,
       radius: 0.5,
     },
+    */
   ],
   exit: {
     x: 18,

src/levels/level_2.ts

@@ -55,7 +55,7 @@ const level: Level = {
     angle: 90,
     health: 100,
   },
-  enemies: [
+  zombies: [
     generateZombie(1.5, 9.5),
 
     generateZombie(4.5, 6.5),

src/lib/ecs/systems/AISystem.ts

@@ -15,7 +15,7 @@ import { ComponentContainer } from "../Component";
 import EnemyComponent from "../components/EnemyComponent";
 import MoveComponent, { MainDirection } from "../components/MoveComponent";
 import AngleComponent from "../components/AngleComponent";
-// import { normalizeAngle, radiansToDegrees } from "src/lib/utils";
+import { normalizeAngle, radiansToDegrees } from "src/lib/utils";
 
 export default class AISystem extends System {
   componentsRequired = new Set([
@@ -66,7 +66,6 @@ export default class AISystem extends System {
 
     const cameraPosition = camera.get(PositionComponent);
     const cameraCircle = camera.get(CircleComponent);
-    const cameraAngle = camera.get(AngleComponent);
     const cameraHealth = camera.get(HealthComponent);
 
     entities.forEach((entity: Entity) => {
@@ -85,12 +84,11 @@ export default class AISystem extends System {
         cameraCircle.radius -
         entityCircle?.radius;
 
-      if (entityAI.distance > d && d > 0) {
-        const newAngle = cameraAngle.angle + 180; // normalizeAngle(-radiansToDegrees(Math.acos(dx / d)));
-
+      if (entityAI.distance > d  && d > 0) {
+        const angle = radiansToDegrees(Math.atan(dy / dx));
         entityAnimation.switchState("walk");
         entityMove.mainDirection = MainDirection.Forward;
-        entityAngle.angle = newAngle;
+        entityAngle.angle = normalizeAngle(angle);
       } else {
         entityMove.mainDirection = MainDirection.None;
         entityAnimation.switchState("idle");

src/lib/ecs/systems/MoveSystem.ts

@@ -82,6 +82,9 @@ export default class MoveSystem extends System {
       const mainAngle = degreeToRadians(angleComponent.angle);
       const mainCos = Math.cos(mainAngle);
       const mainSin = Math.sin(mainAngle);
+      if (entity === 1) {
+        console.log('angle', angleComponent.angle, 'cos', mainCos, 'sin', mainSin)
+      }
       const sideAngle = degreeToRadians(angleComponent.angle - 90);
       const sideCos = Math.cos(sideAngle);
       const sideSin = Math.sin(sideAngle);

src/lib/world.ts

@@ -41,14 +41,28 @@ export function createWorld(ecs: ECS, level: Level, textureManager: TextureManag
         ecs.addComponent(entity, new EnemyComponent())
 
         if (enemy.ai) {
-            ecs.addComponent(entity, new AIComponent(2));
-            ecs.addComponent(entity, new AnimatedSpriteComponent('idle', {
-                'attack': animationManager.get('zombieAttack'),
-                'idle': animationManager.get('zombieIdle'),
-                'damage': animationManager.get('zombieDamage'),
-                'death': animationManager.get('zombieDeath'),
-                'walk': animationManager.get('zombieWalk'),
-            }))
+            ecs.addComponent(entity, new AIComponent(20));
+        }
+
+        switch (enemy.type) {
+            case "zombie":
+                ecs.addComponent(entity, new AnimatedSpriteComponent('idle', {
+                    'attack': animationManager.get('zombieAttack'),
+                    'idle': animationManager.get('zombieIdle'),
+                    'damage': animationManager.get('zombieDamage'),
+                    'death': animationManager.get('zombieDeath'),
+                    'walk': animationManager.get('zombieWalk'),
+                }))
+                break;
+            case "soldier":
+                ecs.addComponent(entity, new AnimatedSpriteComponent('idle', {
+                    'attack': animationManager.get('soldierAttack'),
+                    'idle': animationManager.get('soldierIdle'),
+                    'damage': animationManager.get('soldierDamage'),
+                    'death': animationManager.get('soldierDeath'),
+                    'walk': animationManager.get('soldierWalk'),
+                }))
+                break;
         }
 
         ecs.addComponent(entity, new CircleComponent(enemy.radius));

src/presets.ts

@@ -91,6 +91,44 @@ export const animation: AnimationSpritePreset[] = [
       "./assets/characters/ZombieAttack2.png",
     ],
   },
+  {
+    id: "soldierIdle",
+    frames: [
+      "./assets/characters/SoldierIdle.png",
+    ],
+  },
+  {
+    id: "soldierWalk",
+    frames: [
+      "./assets/characters/SoldierWalk1.png",
+      "./assets/characters/SoldierWalk2.png",
+      "./assets/characters/SoldierWalk3.png",
+      "./assets/characters/SoldierWalk4.png",
+    ],
+  },
+  {
+    id: "soldierDamage",
+    frames: [
+      "./assets/characters/SoldierDamage1.png",
+      "./assets/characters/SoldierDamage2.png",
+    ],
+  },
+  {
+    id: "soldierDeath",
+    frames: [
+      "./assets/characters/SoldierDeath1.png",
+      "./assets/characters/SoldierDeath2.png",
+      "./assets/characters/SoldierDeath3.png",
+      "./assets/characters/SoldierDeath4.png",
+    ],
+  },
+  {
+    id: "soldierAttack",
+    frames: [
+      "./assets/characters/SoldierAttack1.png",
+      "./assets/characters/SoldierAttack2.png",
+    ],
+  },
 ];
 
 

src/scenes/LevelScene.ts

@@ -15,6 +15,7 @@ import ECS from "src/lib/ecs";
 import { createWorld } from "src/lib/world";
 import UISystem from "src/lib/ecs/systems/UISystem";
 import HealthComponent from "src/lib/ecs/components/HealthComponent";
+import FireSystem from "src/lib/ecs/systems/FireSystem";
 
 interface LevelSceneProps {
   container: HTMLElement;
@@ -38,6 +39,7 @@ export default class LevelScene implements BaseScene {
     const ecs = new ECS();
 
     ecs.addSystem(new ControlSystem(ecs, container));
+    ecs.addSystem(new FireSystem(ecs));
     ecs.addSystem(new AISystem(ecs, level, soundManager));
     ecs.addSystem(new MoveSystem(ecs, level));
     ecs.addSystem(new AnimationSystem(ecs));