Febbweiss/sis
1
0
Fork 0
mirror of https://github.com/Febbweiss/sis.git synced 2026-03-04 22:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature: adding bonus \nRefactoring: isolation of animations

Browse Source
This commit is contained in:
Fabrice Ecaille
2013-10-03 13:30:52 +02:00
parent a9fb1bb8e9
commit 99ef4fc3f5
7 changed files with 249 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
js/spaceinvaders-core.js
View File

@@ -11,31 +11,35 @@
var WAVES = [
{
wave : [ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ],
move : function() {
var offset = (PLAYGROUND_WIDTH - 16 * this.width) / 2;
if (Math.abs((this.getOriginX() - this.getX())) >= offset) {
this.directionX *= -1;
this.y = (this.y + this.height / 4);
}
}
},
bonus : [50, 20]
},
{
wave : [ [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ],
wave : [ [ 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ],
move : function() {
var offset = (PLAYGROUND_WIDTH - 16 * this.width) / 2;
if (Math.abs((this.getOriginX() - this.getX())) >= offset) {
this.directionX *= -1;
this.y = (this.y + this.height / 4);
}
}
} ];
},
bonus : [30, 15]
}
];
Game = {
running : false,
@@ -46,6 +50,7 @@ Game = {
init : function() {
"use strict";
animations = WORLD.farm;
Game.wave = Game.wave + 1;
var row, col;
var wave = WAVES[Game.wave].wave;
@@ -204,7 +209,15 @@ Game = {
return elementOfArray.id == alien.id;
}, true);
Game.aliens = aliensNotInArray;
$(this)[0].alien.hit();
var alienX = alien.alien.x;
var alienY = alien.alien.y;
var alienWidth = alien.alien.width;
var alienHeight = alien.alien.height;
alien.alien.hit();
var remainingAliens = $(".alien").length;
if( remainingAliens == WAVES[Game.wave].bonus[0] || remainingAliens == WAVES[Game.wave].bonus[1] ) {
Game.bonus(alienX, alienY, alienWidth, alienHeight);
}
})
if( collisions.length > 0 ) {
this.remove()
@@ -216,6 +229,40 @@ Game = {
}
});
},
bonusCollision : function() {
if( !Game.running ) {
return false;
}
$(".bonus").each(function(i,e) {
var collisions = $(this).collision("#ship,."+$.gQ.groupCssClass);
var bonus = $(this)[0].bonus;
if( collisions.length > 0 ) {
if( bonus.type === "weapon" ) {
Game.ship.weapon = new bonus.clazz;
$("#current_weapon").setAnimation(bonus.animation.animation);
this.remove();
}
}
});
},
bonus : function(alienX, alienY, alienWidth, alienHeight) {
console.log( animations.bonus, animations.bonus.length - 1);
var bonus = animations.bonus[Math.round(Math.random() * (animations.bonus.length - 1)) ];
console.log("Bonus ", bonus, " pos ", alienX, " ", alienY, " ", alienWidth, " ", alienHeight);
var id = Math.round(Math.random() * 10000);
$("#actors").addSprite("bonus" + id,
$.extend(
{
posx: alienX + (alienWidth - bonus.animation.width) / 2,
posy: alienY
}, bonus.animation));
$("#bonus" + id).addClass("bonus");
$("#bonus" + id)[0].bonus = bonus;
},
alienShotCollision : function() {
if( !Game.running ) {
@@ -236,7 +283,7 @@ Game = {
Game.hit();
})
if( collisions.length > 0 ) {
this.remove()
this.remove();
}
});
}