Break out spawnable entities and use a registry to spawn them.

Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>

lib/classes/sprite.dart

@@ -1 +0,0 @@
-typedef Sprite = ({double x, double y, int spriteIndex});

lib/features/difficulty/difficulty_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wolf_dart/classes/difficulty.dart';
+import 'package:wolf_dart/features/difficulty/difficulty.dart';
 import 'package:wolf_dart/features/renderer/renderer.dart';
 
 class DifficultyScreen extends StatelessWidget {

lib/features/entities/decorative.dart

@@ -1,4 +1,4 @@
-import 'package:wolf_dart/classes/entity.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
 
 class Decorative extends Entity {
   Decorative({
@@ -19,4 +19,24 @@ class Decorative extends Entity {
     if (objId == 124) return 95; // Dead guard
     return objId - 21;
   }
+
+  static Decorative? trySpawn(
+    int objId,
+    double x,
+    double y,
+    int difficultyLevel,
+  ) {
+    if (isDecoration(objId)) {
+      return Decorative(
+        x: x,
+        y: y,
+        spriteIndex: getSpriteIndex(objId),
+        mapId: objId,
+        state: objId == 124 ? EntityState.dead : EntityState.staticObj,
+      );
+    }
+
+    // Not a decoration!
+    return null;
+  }
 }

lib/features/entities/enemies/brown_guard.dart

@@ -1,8 +1,8 @@
 import 'dart:math' as math;
 
-import 'package:wolf_dart/classes/enemy.dart';
-import 'package:wolf_dart/classes/entity.dart';
 import 'package:wolf_dart/classes/linear_coordinates.dart';
+import 'package:wolf_dart/features/entities/enemies/enemy.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
 
 class BrownGuard extends Enemy {
   static const double speed = 0.03;
@@ -14,24 +14,42 @@ class BrownGuard extends Enemy {
     required super.angle,
     required super.mapId,
   }) : super(
-         spriteIndex: 50, // Default front-facing idle
+         // Default front-facing idle
+         spriteIndex: 50,
          state: EntityState.idle,
        );
 
-  // Checks if a Map ID is a valid Brown Guard for the selected difficulty
+  static BrownGuard? trySpawn(
-  static bool isSpawnableForDifficulty(int objId, int difficultyLevel) {
+    int objId,
+    double x,
+    double y,
+    int difficultyLevel,
+  ) {
+    bool canSpawn = false;
     switch (difficultyLevel) {
       case 0:
-        return objId >= 108 && objId <= 115;
+        canSpawn = objId >= 108 && objId <= 115;
+        break;
       case 1:
-        return objId >= 144 && objId <= 151;
+        canSpawn = objId >= 144 && objId <= 151;
+        break;
       case 2:
-        return objId >= 180 && objId <= 187;
+        canSpawn = objId >= 180 && objId <= 187;
+        break;
       case 3:
-        return objId >= 216 && objId <= 223;
+        canSpawn = objId >= 216 && objId <= 223;
-      default:
+        break;
-        return false;
     }
+
+    if (canSpawn) {
+      return BrownGuard(
+        x: x,
+        y: y,
+        angle: Enemy.getInitialAngle(objId),
+        mapId: objId,
+      );
+    }
+    return null; // Not a Brown Guard!
   }
 
   @override
@@ -64,8 +82,12 @@ class BrownGuard extends Enemy {
       }
 
       double diff = angle - angleToPlayer;
-      while (diff <= -math.pi) diff += 2 * math.pi;
+      while (diff <= -math.pi) {
-      while (diff > math.pi) diff -= 2 * math.pi;
+        diff += 2 * math.pi;
+      }
+      while (diff > math.pi) {
+        diff -= 2 * math.pi;
+      }
 
       int octant = ((diff + (math.pi / 8)) / (math.pi / 4)).floor() % 8;
       if (octant < 0) octant += 8;

lib/features/entities/enemies/enemy.dart

@@ -1,7 +1,7 @@
 import 'dart:math' as math;
 
-import 'package:wolf_dart/classes/entity.dart';
 import 'package:wolf_dart/classes/linear_coordinates.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
 
 abstract class Enemy extends Entity {
   Enemy({

lib/features/entities/entity.dart

@@ -1,6 +1,6 @@
 enum EntityState { staticObj, idle, patrolling, shooting, pain, dead }
 
-class Entity {
+abstract class Entity<T> {
   double x;
   double y;
   int spriteIndex;

lib/features/entities/entity_registry.dart

@@ -0,0 +1,35 @@
+import 'package:wolf_dart/features/entities/decorative.dart';
+import 'package:wolf_dart/features/entities/enemies/brown_guard.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
+
+typedef EntitySpawner =
+    Entity? Function(int objId, double x, double y, int difficultyLevel);
+
+abstract class EntityRegistry {
+  // Add future enemies (SSGuard, Dog, etc.) to this list!
+  static final List<EntitySpawner> _spawners = [
+    Decorative.trySpawn,
+    BrownGuard.trySpawn,
+  ];
+
+  static Entity? spawn(
+    int objId,
+    double x,
+    double y,
+    int difficultyLevel,
+    int maxSprites,
+  ) {
+    for (final spawner in _spawners) {
+      Entity? entity = spawner(objId, x, y, difficultyLevel);
+
+      if (entity != null) {
+        // Safety bounds check for the VSWAP array
+        if (entity.spriteIndex >= 0 && entity.spriteIndex < maxSprites) {
+          return entity;
+        }
+        return null; // VSWAP doesn't have this sprite!
+      }
+    }
+    return null; // No class claimed this Map ID
+  }
+}

lib/features/renderer/raycast_painter.dart

@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
-import 'package:wolf_dart/classes/entity.dart';
 import 'package:wolf_dart/classes/linear_coordinates.dart';
 import 'package:wolf_dart/classes/matrix.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
 import 'package:wolf_dart/features/renderer/color_palette.dart';
 
 class RaycasterPainter extends CustomPainter {

lib/features/renderer/renderer.dart

@@ -3,13 +3,12 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
-import 'package:wolf_dart/classes/decorative.dart';
-import 'package:wolf_dart/classes/difficulty.dart';
-import 'package:wolf_dart/classes/enemy.dart';
-import 'package:wolf_dart/classes/entity.dart';
 import 'package:wolf_dart/classes/linear_coordinates.dart';
 import 'package:wolf_dart/classes/matrix.dart';
-import 'package:wolf_dart/features/enemies/brown_guard.dart';
+import 'package:wolf_dart/features/difficulty/difficulty.dart';
+import 'package:wolf_dart/features/entities/enemies/enemy.dart';
+import 'package:wolf_dart/features/entities/entity.dart';
+import 'package:wolf_dart/features/entities/entity_registry.dart';
 import 'package:wolf_dart/features/map/wolf_map.dart';
 import 'package:wolf_dart/features/renderer/raycast_painter.dart';
 import 'package:wolf_dart/sprite_gallery.dart';
@@ -88,34 +87,17 @@ class _WolfRendererState extends State<WolfRenderer>
             case 22:
               playerAngle = math.pi;
           }
-        } // 1. POPULATE DECORATIONS & DEAD BODIES
+        } else {
-        else if (Decorative.isDecoration(objId)) {
+          Entity? newEntity = EntityRegistry.spawn(
-          int spriteIdx = Decorative.getSpriteIndex(objId);
+            objId,
-          if (spriteIdx >= 0 && spriteIdx < gameMap.sprites.length) {
+            x + 0.5,
-            entities.add(
+            y + 0.5,
-              Decorative(
+            widget.difficulty.level,
-                x: x + 0.5,
+            gameMap.sprites.length,
-                y: y + 0.5,
+          );
-                spriteIndex: spriteIdx,
+
-                mapId: objId,
+          if (newEntity != null) {
-                // NEW: Dynamically assign the state!
+            entities.add(newEntity);
-                state: objId == 124 ? EntityState.dead : EntityState.staticObj,
-              ),
-            );
-          }
-        } else if (BrownGuard.isSpawnableForDifficulty(
-          objId,
-          widget.difficulty.level,
-        )) {
-          if (50 < gameMap.sprites.length) {
-            entities.add(
-              BrownGuard(
-                x: x + 0.5,
-                y: y + 0.5,
-                angle: Enemy.getInitialAngle(objId),
-                mapId: objId,
-              ),
-            );
           }
         }
       }