Skip to content

Commit 34766ac

Browse files
Stat fixes
1 parent 595196b commit 34766ac

File tree

3 files changed

+10
-25
lines changed

3 files changed

+10
-25
lines changed

src/Entity/Misc/ArenaCloser.ts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,6 @@ export default class ArenaCloser extends TankBody {
5353

5454
this.setTank(Tank.ArenaCloser);
5555

56-
const def = (this.definition = Object.assign({}, this.definition));
57-
// 598 is what the normal health increase for stat/level would be, so we just subtract it.
58-
def.maxHealth = 10000 - 598;
59-
// TODO(ABC):
60-
// Fix all the stats
61-
def.speed = this.ai.movementSpeed = this.cameraEntity.cameraData.values.movementSpeed = 5;
62-
63-
Object.defineProperty(this, "damagePerTick", {
64-
get() {
65-
return 45;
66-
},
67-
set() {}
68-
});
69-
7056
this.nameData.values.name = "Arena Closer";
7157
this.styleData.values.color = Color.Neutral;
7258
this.positionData.values.flags |= PositionFlags.canMoveThroughWalls;
@@ -76,6 +62,12 @@ export default class ArenaCloser extends TankBody {
7662

7763
this.ai.aimSpeed = this.barrels[0].bulletAccel * 1.6;
7864
this.setInvulnerability(true);
65+
66+
// TODO(ABC):
67+
// Fix all the stats
68+
this.ai.movementSpeed = this.cameraEntity.cameraData.values.movementSpeed = 5;
69+
this.healthData.values.health = this.healthData.values.maxHealth = 10000;
70+
this.damagePerTick = 45;
7971
}
8072

8173
public tick(tick: number) {
@@ -91,6 +83,5 @@ export default class ArenaCloser extends TankBody {
9183
}
9284

9385
super.tick(tick);
94-
this.ai.movementSpeed = this.cameraEntity.cameraData.movementSpeed = 5;
9586
}
9687
}

src/Entity/Misc/Dominator.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,7 @@ export default class Dominator extends TankBody {
9292

9393
this.base = base;
9494

95-
Object.defineProperty(this, "damagePerTick", {
96-
get() {
97-
return 10;
98-
},
99-
set() {}
100-
});
95+
this.damagePerTick = 10;
10196

10297
if (this.styleData.values.flags & StyleFlags.isFlashing) { // Remove spawn shield
10398
this.styleData.values.flags ^= StyleFlags.isFlashing;

src/Entity/Misc/Mothership.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ export default class Mothership extends TankBody {
6565

6666
for (let i = Stat.MovementSpeed; i < Stat.HealthRegen; ++i) camera.setStat(i as Stat, 7);
6767
camera.setStat(Stat.HealthRegen, 1);
68-
69-
const def = (this.definition = Object.assign({}, this.definition));
70-
// 418 is what the normal health increase for stat/level would be, so we just subtract it and force it 7k
71-
def.maxHealth = 7000 - 418;
68+
69+
this.healthData.values.health = this.healthData.values.maxHealth = 7000;
7270
}
7371

7472
public onDeath(killer: Live): void {
@@ -129,6 +127,7 @@ export default class Mothership extends TankBody {
129127
}
130128
}
131129
}
130+
132131
const team = this.relationsData.values.team;
133132
if (team?.teamData) {
134133
team.teamData.mothershipX = this.positionData.values.x;

0 commit comments

Comments
 (0)