diff --git a/zo950m57cc.js b/zo950m57cc.js index eb7cd43..6edbc52 100644 --- a/zo950m57cc.js +++ b/zo950m57cc.js @@ -1,3 +1,4 @@ + if (!this.entityLoaded) { return; } @@ -565,7 +566,7 @@ if (GameLib.Utils.UndefinedOrNull(this.initialized)) { this.kill = function(enemy) { - this.meshes[enemy.meshType].map( + this.meshes[enemy.meshType] = this.meshes[enemy.meshType].map( function(object) { if (object.mesh === enemy.mesh) { object.inUse = false; @@ -770,25 +771,27 @@ if (this.mouseIsDown) mesh.name.indexOf('Tree - Small') !== -1 //tree small ) { - if (mesh.materials[0].name.indexOf('Trees') === -1) { + var material = mesh.materials[0]; + + if (material.name.indexOf('Trees') === -1) { mesh.instance.material.color.sub(this.toBlack); - mesh.materials[0].color.r = mesh.instance.material.color.r; - mesh.materials[0].color.g = mesh.instance.material.color.g; - mesh.materials[0].color.b = mesh.instance.material.color.b; + material.color.r = mesh.instance.material.color.r; + material.color.g = mesh.instance.material.color.g; + material.color.b = mesh.instance.material.color.b; - mesh.materials[0].color.instance = mesh.instance.material.color; + material.color.instance = mesh.instance.material.color; if (mesh.instance.material.color.r <= 0) { this.burn(mesh); - if (mesh.instance.material.emissive) { - mesh.instance.material.emissive.add(this.toRed); - mesh.instance.material.emissive.add(this.toRed); + if (mesh.instance.material.color) { + mesh.instance.material.color.add(this.toRed); + mesh.instance.material.color.add(this.toRed); - if (mesh.instance.material.emissive.r >= 0.8) { + if (mesh.instance.material.color.r >= 0.8) { this.explode(mesh); } } @@ -806,12 +809,11 @@ if (this.mouseIsDown) if (mesh.life <= 0) { this.burnTree(mesh); - if (mesh.instance.material.emissive) { - mesh.instance.material.emissive.add(this.toRed); - mesh.instance.material.emissive.add(this.toRed); + if (mesh.instance.material.color) { + mesh.instance.material.color.add(this.toRed); + mesh.instance.material.color.add(this.toRed); } } - } } }.bind(this) @@ -874,32 +876,9 @@ if (this.enemySpawnTime > this.enemySpawnInterval && this.running) { this.enemySpawnTime = 0; this.spawnEnemy(); } -// - -// if (this.kanister.explodeParticleEngine) { -// if (GameLib.Utils.UndefinedOrNull(this.kanister.waiting)) { -// this.kanister.waiting = true; -// } else { -// this.kanister.explodeParticleEngine.remove(); -// this.kanister.explodeParticleEngine = null; -// delete this.kanister.waiting; -// } -// } -// -// if (this.kanisterTime > (this.kanisterLife / 2)) { -// -// this.kanister.visible = true; -// this.kanister.updateInstance('visible'); -// -// GameLib.Event.Emit( -// GameLib.Event.GAME_DATA, -// { -// event : 'kanisterAppeared' -// } -// ); -// } this.enemies = this.enemies.reduce( + function(result, enemy) { if (enemy.exploding === true) {