koneko/bastion.overflow.fun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

electric tower chains properly

Browse Source
This commit is contained in:
koneko 2025-02-17 11:49:44 +01:00
parent f84108847b
commit 9d998a45e1
9 changed files with 98 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/assets/json/Gems.json
View File

@ -8,7 +8,7 @@
"textures": [],
"cantCombineWith": [],
"specialCombine": [],
"initialGemValue": 10,
"initialGemValue": 100,
"genericImprovements": [
{
"damageUp": 2,
@ -16,7 +16,7 @@
"rangeUp": 0,
"timeToLiveUp": 0,
"pierceUp": 1,
"gemValueUp": 0
"gemValueUp": 50
},
{
"damageUp": 2,
@ -24,14 +24,14 @@
"rangeUp": 0,
"timeToLiveUp": 0,
"pierceUp": 1,
"gemValueUp": 10
"gemValueUp": 100
}
],
"gemResistanceModifications": [
{
"physical": 0,
"divine": 0,
"fire": 0.25,
"fire": 0.1,
"ice": 0,
"frostfire": 0
},

44
public/assets/json/Towers.json
View File

@ -10,12 +10,12 @@
"description": "The building block of society, nothing more basic exists.",
"stats": {
"damage": 2,
"cooldown": 2000,
"gemSlotsAmount": 2,
"cost": 100,
"range": 4,
"cooldown": 1500,
"gemSlotsAmount": 1,
"cost": 50,
"range": 3,
"timeToLive": 20,
"pierce": 1
"pierce": 2
}
},
{
@ -28,10 +28,10 @@
"projectileTexturesArrayLength": 4,
"description": "If you feel a little circular.",
"stats": {
"damage": 2,
"cooldown": 2000,
"gemSlotsAmount": 3,
"cost": 125,
"damage": 3,
"cooldown": 4000,
"gemSlotsAmount": 2,
"cost": 100,
"range": 2.5,
"timeToLive": 12,
"pierce": 30
@ -45,15 +45,15 @@
"projectile": "yellow",
"projectileTextures": [],
"projectileTexturesArrayLength": 4,
"description": "Think of something",
"description": "Zap zap zap!",
"stats": {
"damage": 2,
"cooldown": 2000,
"gemSlotsAmount": 3,
"cost": 125,
"range": 2.5,
"damage": 3,
"cooldown": 3500,
"gemSlotsAmount": 2,
"cost": 150,
"range": 3,
"timeToLive": 12,
"pierce": 30
"pierce": 10
}
},
{
@ -66,13 +66,13 @@
"projectileTexturesArrayLength": 4,
"description": "",
"stats": {
"damage": 2,
"cooldown": 2000,
"damage": 4,
"cooldown": 1000,
"gemSlotsAmount": 3,
"cost": 125,
"range": 2.5,
"timeToLive": 12,
"pierce": 30
"cost": 200,
"range": 2,
"timeToLive": 15,
"pierce": 5
}
},
{

35
public/assets/missions/02_the_turn.json
View File

@ -98,8 +98,8 @@
"waves": [
{
"firstCreepSpawnTick": 500,
"spawnIntervalTicks": 1000,
"creeps": [0, 0, 0, 0, 0]
"spawnIntervalTicks": 500,
"creeps": [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 2]
}
],
"offeredGems": [0, 0, 0, 0]
@ -109,10 +109,35 @@
{
"firstCreepSpawnTick": 500,
"spawnIntervalTicks": 1000,
"creeps": [1, 1, 1, 1, 1]
"creeps": [0, 0, 1, 1, 1, 4, 5, 5, 5, 1, 1, 0, 0]
}
],
"offeredGems": [0, 1, 2, 3]
"offeredGems": [1, 1, 1, 0]
},
{
"waves": [
{
"firstCreepSpawnTick": 500,
"spawnIntervalTicks": 1000,
"creeps": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
},
{
"firstCreepSpawnTick": 500,
"spawnIntervalTicks": 500,
"creeps": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
}
],
"offeredGems": [0, 2, 2, 3]
},
{
"waves": [
{
"firstCreepSpawnTick": 500,
"spawnIntervalTicks": 100,
"creeps": [1, 1, 1, 1, 1, 1, 1, 1, 1]
}
],
"offeredGems": [0, 2, 2, 3]
},
{
"waves": [
@ -122,7 +147,7 @@
"creeps": [2, 2, 2, 2, 2]
}
],
"offeredGems": [0, 1, 2, 3]
"offeredGems": [0, 1, 3, 3]
}
]
}

46
src/classes/game/Grid.ts
View File

@ -76,7 +76,6 @@ export class Cell extends GameObject {
this.hasTowerPlaced = false;
Engine.Grid.rangePreview.clear();
} else if (towerName == GameAssets.Towers[TowerType.Buff].name) {
console.log('TRIpped!');
let twr = Engine.TowerManager.GetTowerByRowAndCol(row, col);
if (Engine.Grid.IsCellInRangeOfOtherCell(row, col, twr.computedRange, this)) {
console.log('REMOVED!');
@ -86,59 +85,16 @@ export class Cell extends GameObject {
}
});
// Disable this if you want to add new maps.
if (true) return;
const text = new PIXI.Text({
text: `${this.column}|${this.row}`,
style: new PIXI.TextStyle({
fill: 0xffffff,
fontSize: 16,
stroke: {
color: 0x000000,
width: 2,
},
}),
});
this.container.addChild(text);
text.anchor.set(0.5, 0.5);
text.x = this.bb.width / 2;
text.y = this.bb.height / 2;
if (this.type == TerrainType.Path) {
text.style.fill = 'green';
text.style.fontWeight = 'bold';
}
if (this.type == TerrainType.Restricted) {
text.style.fill = 'gold';
}
this.clickDetector.on('pointerup', () => {
const cellIndex = genPath.findIndex(([col, row]) => col === this.column && row === this.row);
if (cellIndex !== -1) {
text.style.fill = 0xffffff;
genPath.splice(cellIndex, 1);
} else {
text.style.fill = 0xff0000;
genPath.push([this.column, this.row]);
}
console.log('updated gen path');
console.log(JSON.stringify(genPath));
});
// See commit f84108847b6ba6c337954a742f4dc1a38a2c925b
}
public showRangePreview(invalid, range) {
let color = 0xffffff;
if (invalid) color = 0xff0000;
Engine.Grid.rangePreview.clear();
console.log(
`Showing range preview ${this.column * Engine.GridCellSize + Engine.GridCellSize / 2}x - ${
this.row * Engine.GridCellSize + Engine.GridCellSize / 2
}y`
);
console.log(
Engine.Grid.rangePreview.circle(
this.column * Engine.GridCellSize + Engine.GridCellSize / 2,
this.row * Engine.GridCellSize + Engine.GridCellSize / 2,
range * Engine.GridCellSize
)
);
Engine.Grid.rangePreview.fill({ color: color, alpha: 0.3 });
}

2
src/classes/game/Projectile.ts
View File

@ -49,7 +49,7 @@ export default class Projectile extends GameObject {
this.sprite.play();
this.container.x = this.x;
this.container.y = this.y;
this.sprite.tint = tint;
// this.sprite.tint = tint;
this.container.addChild(this.sprite);
Engine.GameMaster.currentScene.stage.addChild(this.container);

9
src/classes/game/Tower.ts
View File

@ -1,11 +1,10 @@
import { Engine } from '../Bastion';
import * as PIXI from 'pixi.js';
import GameObject from '../GameObject';
import { CreepResistancesDefinition, GemType, TowerDefinition } from '../Definitions';
import { CreepResistancesDefinition, TowerDefinition } from '../Definitions';
import { Cell } from './Grid';
import { TowerBehaviours } from './TowerManager';
import Projectile, { calculateAngleToPoint } from './Projectile';
import Creep from './Creep';
import Projectile from './Projectile';
import Gem from './Gem';
import {
DebuffTowerBehaviour,
@ -145,13 +144,13 @@ export class Tower extends GameObject {
this.totalGemResistanceModifications
);
const time = new Date().toISOString();
console.log(`${time} ${this.definition.name} shot at ${angle} degrees`);
// console.log(`${time} ${this.definition.name} shot at ${angle} degrees`);
this.projectiles.push(proj);
return proj;
}
public Sell() {
this.setAsSold = true;
// Selling logic is handled in TowerManager.update()
this.setAsSold = true;
}
public update(elapsedMS: any): void {
if (this.sold) return;

35
src/classes/game/TowerBehaviours.ts
View File

@ -73,11 +73,11 @@ export function computeGemImprovements(tower: Tower) {
// Buff tower
if (tower.parent.isBuffedBy.length > 0 && tower.definition.name != GameAssets.Towers[TowerType.Buff].name) {
let buffedBy = tower.parent.isBuffedBy[0];
tower.computedDamageToDeal += Math.ceil(buffedBy.computedDamageToDeal / 3);
tower.computedCooldown -= Math.ceil(buffedBy.computedCooldown / 5);
tower.computedRange += Math.ceil(buffedBy.computedRange / 10);
tower.computedTimeToLive += Math.ceil(buffedBy.computedTimeToLive / 5);
tower.computedPierce += Math.ceil(buffedBy.computedPierce / 4);
tower.computedDamageToDeal += Number((buffedBy.computedDamageToDeal / 2).toFixed(1));
tower.computedCooldown -= (buffedBy.computedCooldown * 100) / 5 / 100;
tower.computedRange += Number((buffedBy.computedRange / 10).toFixed(1));
tower.computedTimeToLive += (buffedBy.computedTimeToLive * 100) / 5 / 100;
tower.computedPierce += (buffedBy.computedPierce * 100) / 4 / 100;
tower.totalGemResistanceModifications.physical +=
(buffedBy.totalGemResistanceModifications.physical * 100) / 2 / 100;
@ -147,25 +147,32 @@ export function ElectricTowerBehaviour(tower: Tower, elapsedMS: number) {
tower.millisecondsUntilNextShot = tower.computedCooldown;
let proj = tower.Shoot(calculateAngleToPoint(x, y, focus.x, focus.y));
proj.onCollide = (creep: Creep, proj: Projectile) => {
let chainedCreepIds = [];
proj.pierce = 0;
function checkNearBy(c) {
let nearByCreeps = Engine.Grid.creeps.filter((nCreep) => {
if (nCreep.id != creep.id) {
const x = nCreep.x;
const y = nCreep.y;
const radius = 3.5 * Engine.GridCellSize;
const d = distance(creep.x, creep.y, x, y);
const radius = 1.5 * Engine.GridCellSize;
const d = distance(c.x, c.y, x, y);
return d < radius;
}
});
nearByCreeps.forEach((nearCreep) => {
new VisualLightning(creep, nearCreep);
if (!chainedCreepIds.find((crID) => crID == nearCreep.id)) chainedCreepIds.push(nearCreep.id);
else return;
checkNearBy(nearCreep);
new VisualLightning(c, nearCreep);
Engine.GameScene.events.emit(
CreepEvents.TakenDamage,
nearCreep.id,
proj.damage / 2,
Math.round(proj.damage / 2),
proj.gemResistanceModifications
);
});
}
checkNearBy(creep);
Engine.GameScene.events.emit(
CreepEvents.TakenDamage,
creep.id,
@ -226,16 +233,6 @@ export function TrapperTowerBehaviour(tower: Tower, elapsedMS: number) {
if (tower.millisecondsUntilNextShot > 0)
tower.millisecondsUntilNextShot -= elapsedMS * Engine.GameScene.gameSpeedMultiplier;
let creepsInRange = tower.GetCreepsInRange();
if (creepsInRange.length > 0) {
let focus = creepsInRange[0];
if (tower.millisecondsUntilNextShot <= 0) {
let x = tower.column * Engine.GridCellSize + Engine.GridCellSize / 2;
let y = tower.row * Engine.GridCellSize + Engine.GridCellSize / 2;
tower.millisecondsUntilNextShot = tower.computedCooldown;
tower.Shoot(calculateAngleToPoint(x, y, focus.x, focus.y));
}
}
}
export function DebuffTowerBehaviour(tower: Tower, elapsedMS: number) {

4
src/classes/game/TowerManager.ts
View File

@ -2,7 +2,7 @@ import * as PIXI from 'pixi.js';
import { Engine } from '../Bastion';
import { TerrainType, TowerDefinition } from '../Definitions';
import GameAssets from '../Assets';
import { distance, Tower } from './Tower';
import { Tower } from './Tower';
import { Cell } from './Grid';
import { GridEvents, TowerEvents } from '../Events';
@ -93,7 +93,6 @@ export default class TowerManager {
this.towers.forEach((tower) => {
if (tower.row == row && tower.column == col) returnTower = tower;
});
// console.log(returnTower, row, col);
return returnTower;
}
public PlaceTower(definition: TowerDefinition, row, column, behaviour: string, ignoreCost?) {
@ -117,7 +116,6 @@ export default class TowerManager {
'Can not place tower on path or other tower, choose another spot.',
'warn'
);
console.warn('Can not place tower on occupied spot or path. Try again.');
}
}
public update(elapsedMS) {

4
src/main.ts
View File

@ -44,7 +44,7 @@ import DebrisManager from './classes/game/DebrisManager';
app.canvas.style.marginBottom = `0`;
app.canvas.style.display = 'block';
}
Engine.latestCommit = await fetch('/latest_commit').then((res) => res.text());
Engine.latestCommit = await fetch('./latest_commit').then((res) => res.text());
window.addEventListener('resize', resize);
resize();
@ -78,14 +78,12 @@ import DebrisManager from './classes/game/DebrisManager';
let gamePausedDueToBlur = false;
window.addEventListener('blur', () => {
console.log('blur');
if (Engine.GameScene && !Engine.GameScene.isPaused) {
Engine.GameScene.PauseGame();
gamePausedDueToBlur = true;
}
});
window.addEventListener('focus', () => {
console.log('focus');
if (Engine.GameScene && gamePausedDueToBlur && Engine.GameScene.isPaused) {
gamePausedDueToBlur = false;
Engine.GameScene.UnpauseGame();