- use paths

Robouste · Robouste · commit 12a900803310 · 2025-01-29T21:56:51.000+01:00
diff --git a/src/configs/assets.config.ts b/src/configs/assets.config.ts
@@ -1,14 +1,3 @@
-import AnimatedTiles from "phaser-animated-tiles/dist/AnimatedTiles.js";
-import {
-  BackgroundSound,
-  EnnemyTag,
-  ImageTag,
-  PluginTag,
-  SfxTag,
-  SpritesheetTag,
-  TilemapTag,
-  TilesetTag,
-} from "../tags";
 import {
   BgsConfig,
   ImageConfig,
@@ -17,7 +6,9 @@ import {
   SpritesheetConfig,
   TileMapConfig,
   TilesetConfig,
-} from "../types";
+} from "@models";
+import { BackgroundSound, EnnemyTag, ImageTag, PluginTag, SfxTag, SpritesheetTag, TilemapTag, TilesetTag } from "@tags";
+import AnimatedTiles from "phaser-animated-tiles/dist/AnimatedTiles.js";
 
 type FuckYou = any;
 
diff --git a/src/configs/ennemies.config.ts b/src/configs/ennemies.config.ts
diff --git a/src/game-objects/ennemy.game-object.ts b/src/game-objects/ennemy.game-object.ts
@@ -1,26 +1,10 @@
-import { CustomScene } from "@game-types";
-import { depthsConfig } from "../configs";
-import { GameHelper } from "../helpers";
-import { ANIMATION, ArcadeBody, ArcadeSprite } from "../phaser-aliases";
-import { AnimationTag, EnnemyTag, SfxTag } from "../tags";
+import { depthsConfig } from "@configs";
+import { GameHelper } from "@helpers";
+import { EnnemyConfig } from "@models";
+import { ANIMATION, ArcadeBody, ArcadeSprite } from "@phaser-aliases";
+import { AnimationTag, SfxTag } from "@tags";
 import { Hero } from "./hero.game-object";
 
-export interface EnnemyConfig {
-  scene: CustomScene;
-  x: number;
-  y: number;
-  chaseDistance: number;
-  speed: number;
-  patrolSpeed: number;
-  sprite: EnnemyTag;
-  attackSprite: EnnemyTag;
-  hp: number;
-  range: number;
-  atkCooldown: number;
-  damage: number;
-  id: number;
-}
-
 export class Ennemy extends ArcadeSprite {
   public declare body: ArcadeBody;
 
@@ -58,6 +42,7 @@ export class Ennemy extends ArcadeSprite {
 
   constructor(config: EnnemyConfig, player: Hero) {
     super(config.scene, config.x, config.y, config.sprite);
+
     this.debugGraphics = this.scene.add.graphics();
 
     this._config = config;
@@ -101,14 +86,24 @@ export class Ennemy extends ArcadeSprite {
     const plugin: PhaserRaycaster = this._config.scene.raycasterPlugin;
 
     this._raycaster = plugin.createRaycaster({
-      debug: false,
+      debug: true,
     });
     this.scene.physics.world.staticBodies.entries.forEach((body) => this._raycaster.mapGameObjects(body.gameObject));
     this._raycaster.mapGameObjects(this._player, true);
 
     this._ray = this._raycaster.createRay();
     this._ray.setRayRange(this._config.chaseDistance);
     // this._ray.setRayRange(1000);
+
+    // this.on("destroy", () => {
+    //   console.log("this.hp", this._config.hp);
+    //   this._raycaster.removeMappedObjects(
+    //     this.scene.physics.world.staticBodies.entries.forEach((body) => this._raycaster.mapGameObjects(body.gameObject))
+    //   );
+    //   this._raycaster.removeMappedObjects(this._player);
+    //   this._ray.destroy();
+    //   this._raycaster.destroy();
+    // });
   }
 
   public update(_: number, __: number): void {
diff --git a/src/game-objects/hero.game-object.ts b/src/game-objects/hero.game-object.ts
@@ -1,9 +1,8 @@
+import { depthsConfig } from "@configs";
+import { GameHelper, HeroState } from "@helpers";
+import { ANIMATION, ArcadeBody, ArcadeSprite } from "@phaser-aliases";
+import { AnimationTag, HeroEventTag, ImageTag, SfxTag, SpritesheetTag } from "@tags";
 import { Scene } from "phaser";
-import { depthsConfig } from "../configs";
-import { HeroState } from "../helpers";
-import { GameHelper } from "../helpers/game.helper";
-import { ANIMATION, ArcadeBody, ArcadeSprite } from "../phaser-aliases";
-import { AnimationTag, HeroEventTag, ImageTag, SfxTag, SpritesheetTag } from "../tags";
 
 export class Hero extends ArcadeSprite {
   public declare body: ArcadeBody;
diff --git a/src/helpers/hero.state.ts b/src/helpers/hero.state.ts
@@ -1,7 +1,7 @@
+import { Hero } from "@game-objects";
+import { HeroStateParams } from "@models";
+import { AnimationTag } from "@tags";
 import { Observable, Subject } from "rxjs";
-import { Hero } from "../game-objects";
-import { AnimationTag } from "../tags";
-import { HeroStateParams } from "../types";
 import { GameHelper } from "./game.helper";
 
 export class HeroState {
diff --git a/src/levels/level-1/1-forest.level.ts b/src/levels/level-1/1-forest.level.ts
@@ -1,7 +1,7 @@
 import { depthsConfig } from "@configs";
-import { Ennemy, EnnemyConfig, Hero } from "@game-objects";
-import { CustomScene } from "@game-types";
+import { Ennemy, Hero } from "@game-objects";
 import { GameHelper, isEnumValue } from "@helpers";
+import { CustomScene, EnnemyConfig } from "@models";
 import { Sprite, Tilemap } from "@phaser-aliases";
 import {
   BackgroundSound,
diff --git a/src/models/asset-config.type.ts b/src/models/asset-config.type.ts
@@ -1,14 +1,5 @@
-import { ImageFrameConfig } from "../phaser-aliases";
-import {
-  BackgroundSound,
-  EnnemyTag,
-  ImageTag,
-  PluginTag,
-  SfxTag,
-  SpritesheetTag,
-  TilemapTag,
-  TilesetTag,
-} from "../tags";
+import { ImageFrameConfig } from "@phaser-aliases";
+import { BackgroundSound, EnnemyTag, ImageTag, PluginTag, SfxTag, SpritesheetTag, TilemapTag, TilesetTag } from "@tags";
 
 interface AssetConfig<Tag extends string> {
   tag: Tag;
diff --git a/src/models/custom-scene.type.ts b/src/models/custom-scene.type.ts
diff --git a/src/models/ennemy-config.model.ts b/src/models/ennemy-config.model.ts
@@ -0,0 +1,18 @@
+import { EnnemyTag } from "@tags";
+import { CustomScene } from "./custom-scene.type";
+
+export interface EnnemyConfig {
+  scene: CustomScene;
+  x: number;
+  y: number;
+  chaseDistance: number;
+  speed: number;
+  patrolSpeed: number;
+  sprite: EnnemyTag;
+  attackSprite: EnnemyTag;
+  hp: number;
+  range: number;
+  atkCooldown: number;
+  damage: number;
+  id: number;
+}
diff --git a/src/models/hero-state.type.ts b/src/models/hero-state.type.ts
diff --git a/src/models/index.ts b/src/models/index.ts
@@ -0,0 +1,4 @@
+export * from "./asset-config.type";
+export * from "./custom-scene.type";
+export * from "./ennemy-config.model";
+export * from "./hero-state.type";
diff --git a/src/scenes/boot.scene.ts b/src/scenes/boot.scene.ts
@@ -1,5 +1,5 @@
+import { SceneTag } from "@tags";
 import { Scene } from "phaser";
-import { SceneTag } from "../tags";
 
 export class Boot extends Scene {
   constructor() {
diff --git a/src/scenes/game-over.scene.ts b/src/scenes/game-over.scene.ts
@@ -1,5 +1,5 @@
+import { SceneTag } from "@tags";
 import { Scene } from "phaser";
-import { SceneTag } from "../tags";
 
 export class GameOver extends Scene {
   camera!: Phaser.Cameras.Scene2D.Camera;
diff --git a/src/scenes/game.scene.ts b/src/scenes/game.scene.ts
@@ -1,8 +1,8 @@
-import { CustomScene } from "@game-types";
 import { GameHelper } from "@helpers";
 import { ANIMATION, Sprite } from "@phaser-aliases";
 import { Hero } from "../game-objects";
 import { ForestLevel } from "../levels";
+import { CustomScene } from "../models";
 import { AnimationTag, HeroEventTag, ImageTag, SceneTag, SpritesheetTag } from "../tags";
 
 export class Game extends CustomScene {
diff --git a/src/types/index.ts b/src/types/index.ts
diff --git a/todo.md b/todo.md
@@ -3,5 +3,5 @@
 - [ ] Review movement system
 - [ ] add ennemies
 - [ ] continue the map
-- [ ] add map animations
-- [ ]
+- [x] add map animations
+- [ ] add "isChasing" to ennemy, so they keep chasing the hero for a moment, even if he gets out of sight
diff --git a/tsconfig.json b/tsconfig.json
@@ -18,7 +18,7 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     "paths": {
-      "@game-types": ["./src/types/index.ts"],
+      "@models": ["./src/models/index.ts"],
       "@tags": ["./src/tags/index.ts"],
       "@configs": ["./src/configs/index.ts"],
       "@game-objects": ["./src/game-objects/index.ts"],
