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 SS extends Enemy {
|
||||
static const double speed = 0.04;
|
||||
static const int _baseSprite = 138;
|
||||
bool _hasFiredThisCycle = false;
|
||||
|
||||
SS({
|
||||
@@ -17,16 +16,16 @@ class SS extends Enemy {
|
||||
required super.angle,
|
||||
required super.mapId,
|
||||
}) : super(
|
||||
spriteIndex: _baseSprite,
|
||||
spriteIndex: EnemyType.ss.spriteBaseIdx,
|
||||
state: EntityState.idle,
|
||||
) {
|
||||
health = 100;
|
||||
damage = 20;
|
||||
}
|
||||
|
||||
static SS? trySpawn(int objId, double x, double y, Difficulty difficulty) {
|
||||
if (objId >= MapObject.ssStart && objId <= MapObject.ssStart + 35) {
|
||||
bool isPatrolling = objId >= MapObject.ssStart + 18;
|
||||
static SS? trySpawn(int objId, double x, double y, Difficulty _) {
|
||||
if (EnemyType.ss.claimsMapId(objId)) {
|
||||
bool isPatrolling = objId >= EnemyType.ss.mapBaseId + 18;
|
||||
|
||||
return SS(
|
||||
x: x,
|
||||
@@ -75,7 +74,7 @@ class SS extends Enemy {
|
||||
|
||||
switch (state) {
|
||||
case EntityState.idle:
|
||||
spriteIndex = _baseSprite + octant;
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + octant;
|
||||
break;
|
||||
|
||||
case EntityState.patrolling:
|
||||
@@ -90,7 +89,8 @@ class SS extends Enemy {
|
||||
}
|
||||
|
||||
int walkFrame = (elapsedMs ~/ 150) % 4;
|
||||
spriteIndex = (_baseSprite + 8) + (walkFrame * 8) + octant;
|
||||
spriteIndex =
|
||||
(EnemyType.ss.spriteBaseIdx + 8) + (walkFrame * 8) + octant;
|
||||
|
||||
if (distance < 6.0 && elapsedMs - lastActionTime > 1500) {
|
||||
if (hasLineOfSight(playerPosition, isWalkable)) {
|
||||
@@ -105,15 +105,15 @@ class SS extends Enemy {
|
||||
// SS machine gun fires much faster than a standard pistol!
|
||||
int timeShooting = elapsedMs - lastActionTime;
|
||||
if (timeShooting < 100) {
|
||||
spriteIndex = _baseSprite + 46; // Aiming
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 46; // Aiming
|
||||
} else if (timeShooting < 200) {
|
||||
spriteIndex = _baseSprite + 47; // Firing
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 47; // Firing
|
||||
if (!_hasFiredThisCycle) {
|
||||
onDamagePlayer(damage);
|
||||
_hasFiredThisCycle = true;
|
||||
}
|
||||
} else if (timeShooting < 300) {
|
||||
spriteIndex = _baseSprite + 48; // Recoil
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 48; // Recoil
|
||||
} else {
|
||||
state = EntityState.patrolling;
|
||||
lastActionTime = elapsedMs;
|
||||
@@ -121,7 +121,7 @@ class SS extends Enemy {
|
||||
break;
|
||||
|
||||
case EntityState.pain:
|
||||
spriteIndex = _baseSprite + 44;
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 44;
|
||||
if (elapsedMs - lastActionTime > 250) {
|
||||
state = EntityState.patrolling;
|
||||
lastActionTime = elapsedMs;
|
||||
@@ -132,13 +132,13 @@ class SS extends Enemy {
|
||||
if (isDying) {
|
||||
int deathFrame = (elapsedMs - lastActionTime) ~/ 150;
|
||||
if (deathFrame < 4) {
|
||||
spriteIndex = (_baseSprite + 40) + deathFrame;
|
||||
spriteIndex = (EnemyType.ss.spriteBaseIdx + 40) + deathFrame;
|
||||
} else {
|
||||
spriteIndex = _baseSprite + 45;
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 45;
|
||||
isDying = false;
|
||||
}
|
||||
} else {
|
||||
spriteIndex = _baseSprite + 45;
|
||||
spriteIndex = EnemyType.ss.spriteBaseIdx + 45;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user