evert
/
tower-defense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/LunaSquee/html5-tower-defense-experiment into fix-enemy-alignment

This commit is contained in:
Taizo 'Tsa6' Simpson 2017-08-22 12:49:06 -04:00
parent 292afea46b 345214d789
commit 3bcb14f3fb
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
index.js
View File

@ -171,6 +171,7 @@ window.onload = function () {
type: 'recurring', type: 'recurring',
waveLow: 0, waveLow: 0,
waveHigh: 10, waveHigh: 10,
oneAfterAnother: false,
enemies: [{ enemies: [{
type: 'basic', type: 'basic',
count: 5, count: 5,
@ -182,6 +183,7 @@ window.onload = function () {
type: 'recurring', type: 'recurring',
waveLow: 10, waveLow: 10,
waveHigh: 15, waveHigh: 15,
oneAfterAnother: false,
enemies: [{ enemies: [{
type: 'basic', type: 'basic',
count: 5, count: 5,
@ -198,24 +200,24 @@ window.onload = function () {
{ {
type: 'recurring', type: 'recurring',
waveLow: 15, waveLow: 15,
oneAfterAnother: false,
enemies: [{ enemies: [{
type: 'basic', type: 'basic',
count: 5, count: 5,
inclCount: true, inclCount: true,
inclHealth: true, inclHealth: true
inclSpeed: true
}, },
{ {
type: 'speedy', type: 'speedy',
count: 10, count: 10,
inclCount: true, inclCount: true,
inclHealth: true, inclHealth: true
inclSpeed: true
}] }]
}, },
{ {
type: 'once-every', type: 'once-every',
every: 5, every: 5,
oneAfterAnother: false,
enemies: [{ enemies: [{
type: 'tough', type: 'tough',
count: 5, count: 5,
@ -225,7 +227,7 @@ window.onload = function () {
}, },
{ {
type: 'once', type: 'once',
wave: 5, wave: 3,
enemies: [{ enemies: [{
type: 'tough', type: 'tough',
count: 2 count: 2
@ -578,6 +580,7 @@ window.onload = function () {
function addEnemies (enemies, type, specs) { function addEnemies (enemies, type, specs) {
let path = Game.map.pathgen[0] let path = Game.map.pathgen[0]
let enemy = Enemies[type] let enemy = Enemies[type]
// Copy the enemy and add x and y coordinates // Copy the enemy and add x and y coordinates
let enemyCopy = Object.assign({ let enemyCopy = Object.assign({
x: path.x, x: path.x,
@ -597,11 +600,13 @@ window.onload = function () {
// Insert them into the spawn queue // Insert them into the spawn queue
for (let i = 0; i < enemies; i++) { for (let i = 0; i < enemies; i++) {
let spawnTime = enemyCopy.frequency * i + (specs.multiply ? (specs.multiply * (enemies * enemyCopy.frequency)) : 0)
if (Game.debug) { if (Game.debug) {
console.log('added %s to spawn at %d', type, enemyCopy.frequency * i) console.log('added %s to spawn at %d', type, spawnTime)
} }
Game.enemySpawnList.push(Object.assign({ Game.enemySpawnList.push(Object.assign({
time: enemyCopy.frequency * i time: spawnTime
}, enemyCopy)) }, enemyCopy))
} }
} }
@ -625,7 +630,7 @@ window.onload = function () {
let e = wv.enemies[i] let e = wv.enemies[i]
let eCount = e.count || 5 let eCount = e.count || 5
let eHealthIncl = 0 let eHealthIncl = 0
let eSpeedIncl = 0 let multiply = wv.oneAfterAnother != null ? wv.oneAfterAnother : false
if (e.inclCount === true) { if (e.inclCount === true) {
eCount += Game.wave eCount += Game.wave
@ -635,10 +640,6 @@ window.onload = function () {
eHealthIncl = e.baseHealth eHealthIncl = e.baseHealth
} }
if (e.baseSpeed) {
eSpeedIncl = e.baseSpeed
}
if (e.inclHealth === true) { if (e.inclHealth === true) {
eHealthIncl = Game.wave * 5 eHealthIncl = Game.wave * 5
if (eHealthIncl > 500) { if (eHealthIncl > 500) {
@ -646,16 +647,9 @@ window.onload = function () {
} }
} }
if (e.inclSpeed === true) {
eSpeedIncl = Game.wave / 5
if (eSpeedIncl > 5) {
eSpeedIncl = 5
}
}
addEnemies(eCount, e.type, { addEnemies(eCount, e.type, {
healthIncrease: eHealthIncl, healthIncrease: eHealthIncl,
speedIncrease: eSpeedIncl multiply: multiply ? parseInt(i) : false
}) })
} }
} }