Working on fixing enemy identification
Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
@@ -8,7 +8,6 @@ import 'package:wolf_dart/features/entities/map_objects.dart';
|
||||
|
||||
class Mutant extends Enemy {
|
||||
static const double speed = 0.045;
|
||||
static const int _baseSprite = 187;
|
||||
bool _hasFiredThisCycle = false;
|
||||
|
||||
Mutant({
|
||||
@@ -17,22 +16,16 @@ class Mutant extends Enemy {
|
||||
required super.angle,
|
||||
required super.mapId,
|
||||
}) : super(
|
||||
spriteIndex: _baseSprite,
|
||||
spriteIndex: EnemyType.mutant.spriteBaseIdx,
|
||||
state: EntityState.idle,
|
||||
) {
|
||||
health = 45;
|
||||
damage = 10;
|
||||
}
|
||||
|
||||
static Mutant? trySpawn(
|
||||
int objId,
|
||||
double x,
|
||||
double y,
|
||||
Difficulty difficulty,
|
||||
) {
|
||||
// Mutants span 252 to 287
|
||||
if (objId >= MapObject.mutantStart && objId <= MapObject.mutantStart + 35) {
|
||||
bool isPatrolling = objId >= MapObject.mutantStart + 18;
|
||||
static Mutant? trySpawn(int objId, double x, double y, Difficulty _) {
|
||||
if (EnemyType.mutant.claimsMapId(objId)) {
|
||||
bool isPatrolling = objId >= EnemyType.mutant.mapBaseId + 18;
|
||||
|
||||
return Mutant(
|
||||
x: x,
|
||||
@@ -81,7 +74,7 @@ class Mutant extends Enemy {
|
||||
|
||||
switch (state) {
|
||||
case EntityState.idle:
|
||||
spriteIndex = _baseSprite + octant;
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + octant;
|
||||
break;
|
||||
|
||||
case EntityState.patrolling:
|
||||
@@ -96,7 +89,8 @@ class Mutant extends Enemy {
|
||||
}
|
||||
|
||||
int walkFrame = (elapsedMs ~/ 150) % 4;
|
||||
spriteIndex = (_baseSprite + 8) + (walkFrame * 8) + octant;
|
||||
spriteIndex =
|
||||
(EnemyType.mutant.spriteBaseIdx + 8) + (walkFrame * 8) + octant;
|
||||
|
||||
if (distance < 6.0 && elapsedMs - lastActionTime > 1000) {
|
||||
if (hasLineOfSight(playerPosition, isWalkable)) {
|
||||
@@ -110,15 +104,15 @@ class Mutant extends Enemy {
|
||||
case EntityState.attacking:
|
||||
int timeShooting = elapsedMs - lastActionTime;
|
||||
if (timeShooting < 150) {
|
||||
spriteIndex = _baseSprite + 46; // Aiming
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 46; // Aiming
|
||||
} else if (timeShooting < 300) {
|
||||
spriteIndex = _baseSprite + 47; // Firing
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 47; // Firing
|
||||
if (!_hasFiredThisCycle) {
|
||||
onDamagePlayer(damage);
|
||||
_hasFiredThisCycle = true;
|
||||
}
|
||||
} else if (timeShooting < 450) {
|
||||
spriteIndex = _baseSprite + 48; // Recoil
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 48; // Recoil
|
||||
} else {
|
||||
state = EntityState.patrolling;
|
||||
lastActionTime = elapsedMs;
|
||||
@@ -126,7 +120,7 @@ class Mutant extends Enemy {
|
||||
break;
|
||||
|
||||
case EntityState.pain:
|
||||
spriteIndex = _baseSprite + 44;
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 44;
|
||||
if (elapsedMs - lastActionTime > 250) {
|
||||
state = EntityState.patrolling;
|
||||
lastActionTime = elapsedMs;
|
||||
@@ -137,13 +131,13 @@ class Mutant extends Enemy {
|
||||
if (isDying) {
|
||||
int deathFrame = (elapsedMs - lastActionTime) ~/ 150;
|
||||
if (deathFrame < 4) {
|
||||
spriteIndex = (_baseSprite + 40) + deathFrame;
|
||||
spriteIndex = (EnemyType.mutant.spriteBaseIdx + 40) + deathFrame;
|
||||
} else {
|
||||
spriteIndex = _baseSprite + 45;
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 45;
|
||||
isDying = false;
|
||||
}
|
||||
} else {
|
||||
spriteIndex = _baseSprite + 45;
|
||||
spriteIndex = EnemyType.mutant.spriteBaseIdx + 45;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user