)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
diff --git a/js/main.js b/js/main.js
old mode 100644
new mode 100755
index 180f2bf..0ccb3a9
--- a/js/main.js
+++ b/js/main.js
@@ -1,78 +1,194 @@
+//Plockar in canvas elementet
var playField = document.getElementById("playField").getContext("2d");
-playField.font = '30px Arial';
+//playField.font = '30px Arial';
+var redColor = "#E74C3C";
+var greenColor = "#1BBC9B";
+var gameContainer = document.getElementById("game-container"); // Diven som hela spelet ligger i.
+gameContainer.style.display ="none";
+
+var introContainer = document.getElementById("intro-container");
+document.getElementById("startGame").addEventListener("click",startGame);
+
+/**
+ * Storleken på canvas
+ */
var playfieldHeight = document.getElementById("playField").height;
var playfieldWidth = document.getElementById("playField").width;
-var obstacleCount = 0;
+/**
+ * Alla element som har med spelinfo containern att göra
+ */
+var infoContainer = document.getElementById('infoContainer');
+var statusTetxt = document.getElementById('statusTetxt');
+var levelCounter = document.getElementById("level");
+var accuracy = document.getElementById("accuracy");
+var totalShotsFired = document.getElementById("totalShotsFired");
+var specialShotsFired = document.getElementById("specialShotsFired");
+var collisionCounter = document.getElementById("collisionCounter");
+var button = document.getElementById('buttonSelector');
+var buttonText = document.getElementById('buttonText');
+
+var levelInfo = document.getElementById("levelInfo");
+var highscoreSignUpContainer = document.getElementById("highscoreSignUpContainer");
+
+var totalShotsFiredHS = document.getElementById("totalShotsFiredHS");
+var shotsFiredHS = document.getElementById("shotsFiredHS");
+var specialShotsFiredHS = document.getElementById("specialShotsFiredHS");
+var collisionCounterHS = document.getElementById("collisionCounterHS");
+
+var hiddentotalShotsFiredHS = document.getElementById("hiddentotalShotsFiredHS");
+var hiddenshotsFiredHS = document.getElementById("hiddenshotsFiredHS");
+var hiddenspecialShotsFired = document.getElementById("hiddenspecialShotsFired");
+var hiddencollisionCounter = document.getElementById("hiddencollisionCounter");
+
+
+/**
+ * Alla element som visar statusen på tid / ammo och hälsa
+ */
+var healthBar = document.getElementById("health-bar");
+var healthCounter = document.getElementById("health");
+var timer = document.getElementById("timer");
+var ammoSelect = document.getElementById('ammoSelect');
+var ammoSelectColor = document.getElementById("ammoSelectColor");
+var displayAmmo = document.getElementById("ammo-info");
+var ammoImage = document.getElementById("ammoImage");
+var SpecialAmmoSelect = document.getElementById('SpecialAmmoSelect');
+var powerAmmoImage = document.getElementById("powerAmmoImage");
+var specialAmmoSelectColor = document.getElementById("specialAmmoSelectColor");
+var displayPowerAmmo = document.getElementById("power-ammo-info");
+
+/**
+ * Element för info under utveklingsfasen
+ */
+var ballCounter = document.getElementById("ballCounter");
+var ammoCounter = document.getElementById("ammoCounter");
+var powerShotsCounter = document.getElementById("powerShotsCounter");
+var swag = document.getElementById('swag');
+var frame = document.getElementById("frame");
+
+/**
+ * Variabler med bilder
+ */
+var backGrounds = ["pixelBG2.jpg", "fantasy.png", "forest.png", "desert.png"];
+var playFieldBackground = document.getElementById("playField");
+var shotsFired = document.getElementById("shotsFired");
+var healthImage = document.getElementById("healthImage");
+var shotImage = document.getElementById("shotImage");
+var specialShotImage = document.getElementById("specialShotImage");
+/**
+ * Skott Variabler
+ */
var shotList = {};
var powerShotList = {};
var powerShotAvailabe = 0;
-// intervall som uppdateringsfunktionen körs
-
-var playerSafetyDistanceY = 300; // Marginalen på Y axeln som bollarna kommer generas ovanför.
-
-//console.log(playfieldHeight + " är Höjden");
-//console.log(playfieldWidth + " är Bredden");
+var typeOfShot = "pistol";
+var ammoLeft = 10;
+/**
+ * Boll variabler
+ */
var bigBallRadius = 60;
var mediumBallRadius = 40;
var smallBallRadius = 20;
-//var firstBallSpeed = Math.floor((Math.random() * 6) + 1);
-var firstBallSpeed = 1;
-
-var collisionCounter = document.getElementById("collisionCounter");
-var ammoCounter = document.getElementById("ammoCounter");
-var ammoLeft = 10;
+var bouncingBalls = {};
+
+/**
+ * Boolean variabler
+ */
+var powerUp = false;
+var restart = false;
+var lockPlayer = false;
+var levelComplete = false;
+
+/**
+ * Variabler som ändras när man klarar en bana!
+ */
+var ballSpeed = 0.2;
+var healthGenerate = 12;
+var ammoGenerate = 11;
+var specialAmmoGenerate = 13;
+var ballSpawnInterval = 10;
+
+/**
+ * Variabler som kontrolerar timing / spawnfrekvens / level
+ */
+var hitPerLevel = 0;
var time = 0;
-var healthCounter = document.getElementById("health");
var frameCount = 0;
var groundHeight = 32; // Höjden på marken i bilden.
-var ballCounter = document.getElementById("ballCounter");
-var accuracy = document.getElementById("accuracy");
-
-var shotsFired = document.getElementById("shotsFired");
-
-var ammoImage = document.getElementById("ammoImage");
-var healthImage = document.getElementById("healthImage");
-
-ammoImage.style.display ="none";
+var level = 1;
+var j = 0; //variabel för att begränsa hur många bollar som genereras per bana
+var strafeX = 260;
+
+/**
+ * Sounds
+ */
+var pop = new Audio();
+pop.src = "sound/pop.wav";
+var shotSound = new Audio();
+shotSound.src = "sound/bang.wav";
+var specialShotSound = new Audio();
+specialShotSound.src = "sound/loudgun.wav";
+var reload = new Audio();
+reload.src = "sound/reload.wav";
+var healthSound = new Audio();
+healthSound.src = "sound/getHealth.wav";
+var damageSound = new Audio();
+damageSound.src = "sound/damageSound.wav";
+var shotgunAmmo = new Audio();
+shotgunAmmo.src = "sound/shotgunreload.wav";
+
+var levelCompleteSound = new Audio();
+levelCompleteSound.src = "sound/nicework.wav";
+
+var gameOverSound = new Audio();
+gameOverSound.src = "sound/boo.mp3";
+
+var gameCompleteSound = new Audio();
+gameCompleteSound.src = "sound/gameComplete.mp3";
+
+/**
+ * Döljer element från DOM:et
+ */
+ammoSelect.style.backgroundColor = greenColor;
healthImage.style.display ="none";
+shotImage.style.display ="none";
+specialShotImage.style.display ="none";
+/**
+ * Skapar spelaren med dess startvärden
+ */
+var player = new Image();
+player.src = "images/villeSprite4.png"; // WTF?! Varför utgår man från vart html-filen ligger och inte JS filen?
+player.left = false;
+player.right = false;
+player.health = 100;
+player.height = 75;
+player.width = 65; //
+player.PositionValueX = 100;
+player.PositionValueY = playfieldHeight - 75 - groundHeight;
+player.animateX = (player.width) - 25;
+player.animateY = player.height;
+function startGame() {
+ introContainer.style.display ="none";
+ gameContainer.style.display ="block";
-function startGame(level) {
- /**
- *
- *<======= ALLTING SOM HAR MED SPELAREN ATT GÖRA =======>
- *
- */
- var player = new Image();
- player.src = "images/villeSprite.png"; // WTF?! Varför utgår man från vart html-filen ligger och inte JS filen?
- player.left = false;
- player.right = false;
- player.health = 5;
- player.height = 75;
- player.width = 65; //
- player.PositionValueX = 100;
- player.PositionValueY = playfieldHeight - 75 - groundHeight;
- player.animateX = (player.width) - 25;
- player.animateY = player.height;
- var strafeX = 0;
+playFieldBackground.style.background = 'url("images/' + backGrounds[level-1] + '")';
/**
*
*<======= STARTA TIMERS! =======>
*
*/
-
function updateTime() {
time++;
document.getElementById("timer").innerHTML = time;
- if (time % 10 == 0) {
+ if (time % 10 === 0) {
ammoLeft += 2;
}
return time;
@@ -80,86 +196,145 @@ function startGame(level) {
function updateFrameCount() {
frameCount++;
+ frame.innerHTML = frameCount;
return frameCount;
}
- // playField.drawImage(player,srcX,srcY,player.width,player.height,player.PositionValueX,player.PositionValueY,player.width,player.height);
- // playField.drawImage(player,strafeX,0,player.width,player.height,player.PositionValueX,player.PositionValueY,player.width,player.height);
- // ship_x = (width / 2) - 25, ship_y = height - 85, ship_w = 65, ship_h = 85,
- /* KOLLAR OM SPELAREN BLIR TRÄFFAD */
-
setInterval(function () {
hit = false;
- player.color = "#fff";
}, 400);
function playerHit(hit) {
if (hit) {
- player.color = "red";
+ damageSound.play();
+ healthBar.className = "";
player.health--;
- checkHealth(player.health)
+ checkHealth(player.health);
}
}
/* FLYTTAR PÅ SPELAREN */
document.onkeydown = function (keyPress) {
- if (keyPress.keyCode === 37) {
+ if (keyPress.keyCode === 37 && lockPlayer === false) {
// Move left
player.left = true;
-
}
- if (keyPress.keyCode === 39) {
+ if (keyPress.keyCode === 39 && lockPlayer === false) {
// Move right
player.right = true;
}
- if (player.right == false && player.left == false) {
- strafeX = 0;
- }
- // Shoot
- if (keyPress.keyCode === 32) {
+ if (player.right === false && player.left === false) {
- if (ammoLeft > 0) {
- generateShot(player.PositionValueX);
- ammoLeft--
+ if(typeOfShot === "pistol")
+ {
+ strafeX = 260;
}
- if (powerShotAvailabe > 0) {
- generatePowerShot(player.PositionValueX);
- powerShotAvailabe--
+ else
+ {
+ strafeX = 845;
+ }
+ }
+ // Shoot spacebar
+ if (keyPress.keyCode === 32 && lockPlayer === false) {
+ shoot(typeOfShot);
+ if(typeOfShot === "pistol")
+ {
+ strafeX = 260;
}
+ else
+ {
+ strafeX = 845;
+ }
+ }
+ // Shoot selector uparrow
+ if (keyPress.keyCode === 38) {
+
+ typeOfShot === "pistol" ?
+
+ (typeOfShot = "shotgun",
+ ammoSelect.style.backgroundColor = "#fff",
+ ammoSelectColor.style.color =greenColor,
+ specialAmmoSelect.style.backgroundColor = greenColor,
+ specialAmmoSelectColor.style.color = "#fff"
+ )
+ :
+ (typeOfShot = "pistol",
+ ammoSelectColor.style.color = "#fff",
+
+ ammoSelect.style.backgroundColor = greenColor,
+ specialAmmoSelect.style.backgroundColor = "#fff",
+ specialAmmoSelectColor.style.color = greenColor
+ );
}
};
document.onkeyup = function (keyPress) {
if (keyPress.keyCode === 37) {
// Move left
player.left = false;
- strafeX = 0;
+ if(typeOfShot == "pistol")
+ {
+ strafeX = 260;
+ }
+ else
+ {
+ strafeX = 845;
+ }
}
if (keyPress.keyCode === 39) {
// Move right
player.right = false;
- strafeX = 0;
-
+ if(typeOfShot == "pistol")
+ {
+ strafeX = 260;
+ }
+ else
+ {
+ strafeX = 845;
+ }
}
};
function playerPosition() {
if (player.left) {
player.PositionValueX -= 10; //fart på spelaren
- if (frameCount % 2 == 0) {
- strafeX = 65;
+ if(typeOfShot == "shotgun")
+ {
+ strafeX = (65*frameCount)+585;
+
+ if(frameCount>4)
+ {
+ frameCount = 0;
+ }
}
- else {
- strafeX = 65 * 2;
+ else
+ {
+ strafeX = 65*frameCount;
+
+ if(frameCount>=4)
+ {
+ frameCount = 0;
+ }
}
}
if (player.right) {
player.PositionValueX += 10; //fart på spelaren
- strafeX = 195;
- if (frameCount % 2 == 0) {
- strafeX = 65 * 3;
+
+ if(typeOfShot == "shotgun")
+ {
+ strafeX = (65*frameCount)+845;
+
+ if(frameCount>4)
+ {
+ frameCount = 0;
+ }
}
- else {
- strafeX = 65 * 4;
+ else
+ {
+ strafeX = (65*frameCount)+260;
+ if(frameCount>=4)
+ {
+ frameCount = 0;
+ }
}
}
// Spelaren kan inte röra sig utanför spelplane
@@ -177,79 +352,53 @@ function startGame(level) {
*
*/
var numberOfCollisions = 0;
- var ballColors = ["#000", "#E4F1FE", "#336E7B", "#4ECDC4", "#3D4A5D", "#26A65B", "#79FF85"];
+ var ballColors = ["#3D4A5D","#1E824C","#D35400"];
//document.getElementById("startGame").addEventListener("click", startGame);
- var speed = 4;
- function bouncingBall(ballSize, startX, startY, speedX) {
+ function bouncingBall(ballSize, startX, startY,speedX,color) {
this.ballRadius = ballSize;
this.PositionValueX = startX;
this.PositionValueY = startY;
this.speedXAxis = speedX;
- this.speedYAxis = Math.floor((Math.random() * speed) + 1);
- this.hexColorCode = ballColors[Math.floor((Math.random() * ballColors.length) + 1)];
+ this.speedYAxis = Math.round((Math.random() * ballSpeed) + 1);
+ this.hexColorCode = ballColors[color];
+
+ // this.hexColorCode = ballColors[Math.floor((Math.random() * ballColors.length) + 1)];
// this.hypo = Math.sqrt(Math.pow(ballSize,2)*2);
- this.isStuck = false;
- // this.ballRadius = Math.ceil((Math.random() * 50) + 10); //
- /* this.PositionValueX = Math.floor(Math.random() * ((playfieldWidth-this.ballRadius*2) - this.ballRadius*2 + 1)) + this.ballRadius*2;
- this.PositionValueY = Math.floor(Math.random() * ((playfieldHeight-playerSafetyDistanceY-this.ballRadius*2) - this.ballRadius*2 + 1)) + this.ballRadius*2;
- this.speedXAxis = Math.floor((Math.random() * 6) + 1);
- this.speedYAxis = Math.floor((Math.random() * 6) + 1);
- this.hexColorCode = ballColors[ Math.floor((Math.random() * ballColors.length) + 1)];*/
+ // this.img = image;
+ // this.isStuck = false;
}
- var bouncingBalls = {};
-
- //document.getElementById("moreBalls").addEventListener("click", addBalls);
- // console.log(bouncingBalls);
var i = 0;
- function addBalls(sizeofHitBall, startX, startY, speedX) {
- bouncingBalls["ball" + i] = new bouncingBall(sizeofHitBall, startX, startY, speedX);
+ function addBalls(sizeofHitBall, startX, startY,speedX,color) {
+ bouncingBalls["ball" + i] = new bouncingBall(sizeofHitBall, startX, startY,speedX,color);
i++;
}
- addBalls(bigBallRadius, 200, 100, firstBallSpeed); // Skapar den första bollen så att spelet kommer igång!
- function updateEntity(ball,hinder) {
+ function updateEntity(ball) {
ball.PositionValueX += ball.speedXAxis;
ball.PositionValueY += ball.speedYAxis;
+
playField.beginPath();
+
playField.fillStyle = ball.hexColorCode;
- // playField.arc(ball.PositionValueX, ball.PositionValueY, ball.ballRadius, 0, Math.PI * 2, true);
- playField.arc(ball.PositionValueX, ball.PositionValueY, ball.ballRadius,0,2*Math.PI);
+
+ playField.arc(ball.PositionValueX, ball.PositionValueY, ball.ballRadius, 0, Math.PI * 2, true);
+
+
playField.closePath();
playField.fill();
- if(obstacleCount === 0){
- hinder.PositionValueY += hinder.speedYAxis;
- //console.log(hinder.speedXAxis
- }
- playField.fillStyle = hinder.color;
- playField.fillRect(hinder.PositionValueX, hinder.PositionValueY, hinder.width, hinder.height);
- obstacleCount++;
- if(obstacleCount === (ballCounter.innerHTML = Object.keys(bouncingBalls).length))
- {
- obstacleCount = 0;
- }
var bounceBordersX = ball.PositionValueX < ball.ballRadius || ball.PositionValueX > playfieldWidth - ball.ballRadius;
var bounceBordersY = ball.PositionValueY < ball.ballRadius || ball.PositionValueY > playfieldHeight - ball.ballRadius - groundHeight;
- var playerGetsHit = (ball.PositionValueY > playfieldHeight - player.height - ball.ballRadius && ((player.PositionValueX + player.width / 2) > ball.PositionValueX - ball.ballRadius && (player.PositionValueX + player.width / 2) < ball.PositionValueX + ball.ballRadius))
- var moveObstacle = hinder.PositionValueY < 0 || hinder.PositionValueY > hinder.maxValue;
-
- // var collidewithObs = testCollisionEntityObstacle(hinders,ball);
+ var playerGetsHit = (ball.PositionValueY > playfieldHeight - player.height - ball.ballRadius && ((player.PositionValueX + player.width / 2) > ball.PositionValueX - ball.ballRadius && (player.PositionValueX + player.width / 2) < ball.PositionValueX + ball.ballRadius));
- // var hypo = Math.sqrt(Math.pow(ball.ballRadius,2)*2);
- //console.log(ball.ballRadius);
- // console.log(hypo);
-
- if(typeof hinder == "undefined")
- {
- // console.log("DET STÄMMER");
if (bounceBordersX) {
ball.speedXAxis = -ball.speedXAxis;
}
@@ -263,68 +412,8 @@ function startGame(level) {
hit = true;
playerHit(hit);
}
- }
- else
- {
-
- if(moveObstacle)
- {
- console.log("DET STÄMMER!");
- hinder.speedYAxis = -hinder.speedYAxis;
-
- }
- if (bounceBordersX)
- {
- ball.speedXAxis = -ball.speedXAxis;
- }
- if ((ball.PositionValueY > hinder.PositionValueY && ball.PositionValueY < hinder.PositionValueY+hinder.height))
- {
- // Studsa på vänster sida
- if((ball.PositionValueX+ball.ballRadius>=hinder.PositionValueX) && (ball.PositionValueX<=hinder.PositionValueX ) )
- {
- ball.speedXAxis = -ball.speedXAxis;
- }
- //Studsa på höger sida
- if((ball.PositionValueX-ball.ballRadius<=hinder.PositionValueX+hinders.width) && (ball.PositionValueX >= hinders.PositionValueX+hinder.width ) )
- {
- ball.speedXAxis = -ball.speedXAxis;
- }
- }
- if ((ball.PositionValueX+ball.ballRadius > hinder.PositionValueX && ball.PositionValueX-ball.ballRadius < hinder.PositionValueX+hinder.width))
- {
- if((ball.PositionValueY-ball.ballRadius+5 < hinder.PositionValueY+hinder.height) && (ball.PositionValueY-ball.ballRadius+5>hinder.PositionValueY))
- {
- ball.isStuck = true;
- // delete ball;
- // console.log("Boll fastnat!")
- }
- if((ball.PositionValueY+ball.ballRadius-5 > hinder.PositionValueY) && (ball.PositionValueY+ball.ballRadius-5=hinder.PositionValueY) && (ball.PositionValueY<=hinder.PositionValueY ) )
- {
- ball.speedYAxis = -ball.speedYAxis;
- }
- if((ball.PositionValueY-ball.ballRadius<=hinders.PositionValueY+hinder.height) && (ball.PositionValueY>=hinder.PositionValueY ) )
- {
- ball.speedYAxis = -ball.speedYAxis;
- }
- }
- if(bounceBordersY)
- {
- ball.speedYAxis = -ball.speedYAxis;
- }
- if(playerGetsHit)
- {
- hit = true;
- playerHit(hit);
- }
- }
}
function getDistanceBetweenEntity(shot, ball) { //return distance (number)
var vx = shot.PositionValueX - ball.PositionValueX;
@@ -338,140 +427,138 @@ function startGame(level) {
}
- /**
- *
- *<======= ALLTING SOM HAR MED HINDREN ATT GÖRA =======>
- *
- */
-
- function createHinder(startX, startY, width, height, moving, speedY, max) {
- this.PositionValueX = startX;
- this.PositionValueY = startY;
- this.width = width;
- this.height = height;
- this.speedYAxis = speedY;
- this.moving = moving;
- this.maxValue = max; // Max hur långt den kan gå ner på x-axeln
- this.color = "#000";
- }
- var hinders = {};
-
- //document.getElementById("moreBalls").addEventListener("click", addBalls);
-
- // console.log(bouncingBalls);
- var hinderCounter = 0;
- function addHinder(startX, startY, width, height, moving, speedY, max) {
- hinders["hinder" + hinderCounter] = new createHinder(startX, startY, width, height, moving, speedY, max);
- hinderCounter++;
- }
-
- addHinder(0,0,0,0,true,0,playfieldHeight-200);
- // addHinder(400,300,220,10,true,2,playfieldHeight-300);
-
- console.log(hinders);
-
/**
*
*<======= ALLTING SOM HAR MED SKOTTEN ATT GÖRA =======>
*
*/
+ function shoot(type){
+ if(type === "pistol"){
+ if (ammoLeft > 0) {
+ generateShot(player.PositionValueX);
+ ammoLeft--;
+ shotSound.play();
+ shotSound.currentTime=0;
+ strafeX = 260+(65*5)
+ }
+ }
+ else if(type === "shotgun"){
+ if (powerShotAvailabe > 0) {
+ generatePowerShot(player.PositionValueX);
+ powerShotAvailabe--;
+ specialShotSound.play();
+ specialShotSound.currentTime=0;
+ strafeX = 260+(65*6)
+ // powerShotsCounter.innerHTML = powerShotAvailabe;
+ }
+ }
+ }
var shotNr = 0;
- // Skapar ett nytt skott och pushar in det i ett objekt
+
function generateShot(playerX) {
var shot =
{
- PositionValueX: playerX + 10,
- PositionValueY: playfieldHeight - groundHeight-player.height,
- width: 10,
- height: 10,
+ PositionValueX: playerX + 11,
+ PositionValueY: playfieldHeight - groundHeight-player.height-10,
+ width: 12,
+ height: 20,
color: "black",
- img: ammoImage
+ img: shotImage
};
shotList["shot" + shotNr] = shot;
if(player.health>0)
{
shotNr++;
- }
shotsFired.innerHTML = shotNr;
-
+ }
+ countTotal()
}
var PowershotNr = 0;
- // Skapar ett nytt skott och pushar in det i ett objekt
function generatePowerShot(playerX) {
var powerShot1 = {
id: 1,
- PositionValueX: playerX,
+ PositionValueX: playerX+20,
PositionValueY: playfieldHeight - groundHeight-player.height,
width: 10,
height: 10,
- //color: "black"
- img: ammoImage
+ img: specialShotImage
};
var powerShot2 = {
id: 2,
- PositionValueX: playerX + 40,
+ PositionValueX: playerX+10,
+ PositionValueY: playfieldHeight - groundHeight-player.height,
+ width: 10,
+ height: 10,
+ img: specialShotImage
+ };
+ var powerShot3 = {
+ id: 3,
+ PositionValueX: playerX+15,
PositionValueY: playfieldHeight - groundHeight-player.height,
width: 10,
height: 10,
//color: "black"
- img: ammoImage
+ img: specialShotImage
};
powerShotList["PowerShot" + PowershotNr] = powerShot1;
PowershotNr++;
+
powerShotList["PowerShot" + PowershotNr] = powerShot2;
PowershotNr++;
+ powerShotList["PowerShot" + PowershotNr] = powerShot3;
+ PowershotNr++;
+ specialShotsFired.innerHTML = (PowershotNr/3);
+
+ countTotal()
+ }
+
+ function countTotal()
+ {
+ totalShotsFired.innerHTML = parseInt(specialShotsFired.innerHTML)+parseInt(shotsFired.innerHTML);
}
+
+
// Förflyttar skotten i y-axeln och om det går utanför y axeln så tas de bort ur arrayen
function animateShots(object) {
- object.PositionValueY -= 15; //fart på skotten
+ object.PositionValueY -= 20; //fart på skotten
if (object.id == 1) {
object.PositionValueX -= 5;
}
if (object.id == 2) {
object.PositionValueX += 5;
}
-
}
-
- function TestShotHits(list, object, obstacles) {
+ function TestShotHits(list, object) {
for (var key in object) {
- for(var thing in obstacles)
- {
- updateEntity(object[key],obstacles[thing]);
-
- if(object[key].isStuck == true)
- {
- // delete object[key];
- // object[key].PositionValueY = object[key].PositionValueY+100;
- // object[key].PositionValueY
- }
+ updateEntity(object[key]);
// KOLLAR OM SKOTTEN TRÄFFAR
for (var k in list) {
var isColliding = testCollisionEntity(list[k], object[key]);
if (isColliding) {
+ pop.play();
+ pop.currentTime=0;
if (object[key].ballRadius == 60) {
- addBalls(mediumBallRadius, object[key].PositionValueX + 15, object[key].PositionValueY, object[key].speedXAxis);
- addBalls(mediumBallRadius, object[key].PositionValueX - 15, object[key].PositionValueY, (object[key].speedXAxis) * -1);
+ addBalls(mediumBallRadius, object[key].PositionValueX + 20, object[key].PositionValueY, (Math.random() * object[key].speedXAxis) + 1, 1);
+ addBalls(mediumBallRadius, object[key].PositionValueX - 20, object[key].PositionValueY, ((Math.random() * object[key].speedXAxis) + 1) * -1,1);
}
if (object[key].ballRadius == 40) {
- addBalls(smallBallRadius, object[key].PositionValueX + 10, object[key].PositionValueY, object[key].speedXAxis);
- addBalls(smallBallRadius, object[key].PositionValueX - 10, object[key].PositionValueY, (object[key].speedXAxis) * -1);
+ addBalls(smallBallRadius, object[key].PositionValueX + 10, object[key].PositionValueY, (Math.random() * object[key].speedXAxis) + 1,2);
+ addBalls(smallBallRadius, object[key].PositionValueX - 10, object[key].PositionValueY, ((Math.random() * object[key].speedXAxis) + 1)* -1,2);
}
delete object[key]; // Tar bort bollen som träffar texten!
- delete list[k]; // Tar bort bollen som träffar texten!
+ delete list[k]; // Tar bort bollen som träffar texten!EB974E
numberOfCollisions++;
-
+ hitPerLevel++;
}
else if (list[k].PositionValueY < 0) {
delete list[k]; // Tar bort bollen som träffas!
}
}
- }
}
}
/**
@@ -483,24 +570,20 @@ function startGame(level) {
this.width = width;
this.height = height;
this.type = type;
- //this.color = color;
this.img = img;
this.PositionValueX = Math.floor(Math.random() * ((playfieldWidth - this.width) - this.width)) + this.width;
this.PositionValueY = playfieldHeight - this.height - groundHeight;
}
var upgrades = {};
-
var upgradeCounter = 0;
function addUpgrades(width, height, type, img) {
upgrades["upgrade" + upgradeCounter] = new upgrade(width, height, type, img);
upgradeCounter++;
}
-
function deleteUpgrades() {
- upgrades = {};
- // console.log(upgrades)
+ upgrades = {};// console.log(upgrades)
}
/**
*
@@ -511,14 +594,10 @@ function startGame(level) {
playField.fillStyle = object.color;
playField.fillRect(object.PositionValueX, object.PositionValueY, object.width, object.height);
}
-
function drawImages(item)
{
playField.drawImage(item.img, item.PositionValueX,item.PositionValueY);
}
-
-
-
/**
*
*<======= UPPDATERING SOM KÖRS VAR 20 millisekund =======>
@@ -528,36 +607,57 @@ function startGame(level) {
function update() {
ballCounter.innerHTML = Object.keys(bouncingBalls).length; // Kollar hur många bollar som är på planen för att avgöra när man klarat en bana!
-
playField.clearRect(0, 0, playfieldWidth, playfieldHeight);
+ //Kontrolerar så att hälsan inte kan bli mer än 100
+ if(player.health > 100){
+ player.health = 100;
+ }
+ //Uppdaterar hälsan
- /* for (var hinder in hinders)
- {
- drawObject(hinders[hinder]);
- }*/
+ healthBar.style.width = player.health + "%";
collisionCounter.innerHTML = numberOfCollisions;
+ var accuracyCounter = ((collisionCounter.innerHTML)/(totalShotsFired.innerHTML)*100).toFixed(0);
+
+ if(shotNr == 0 && PowershotNr == 0)
+ {
+ accuracy.innerHTML = 0;
+ }
+ else if(accuracyCounter<=100)
+ {
+ accuracy.innerHTML = accuracyCounter
+ }
+ else if(accuracyCounter>100)
+ {
+ accuracy.innerHTML = 100;
+ }
+ var accuracyCounter = ((collisionCounter.innerHTML)/(totalShotsFired.innerHTML)*100).toFixed(0);
- if(shotNr == 0)
+ if(shotNr == 0 && PowershotNr == 0)
{
accuracy.innerHTML = 0;
}
- else
+ else if(accuracyCounter<=100)
+ {
+ accuracy.innerHTML = accuracyCounter
+ }
+ else if(accuracyCounter>100)
{
- accuracy.innerHTML = ((collisionCounter.innerHTML)/(shotsFired.innerHTML)*100).toFixed(0);
+ accuracy.innerHTML = 100;
}
ammoCounter.innerHTML = ammoLeft;
+ powerShotsCounter.innerHTML = powerShotAvailabe;
+ displayAmmo.innerHTML = ammoLeft;
+ displayPowerAmmo.innerHTML = powerShotAvailabe;
healthCounter.innerHTML = player.health;
-
+ levelCounter.innerHTML = level;
for (var upgrade in upgrades)
{
drawImages(upgrades[upgrade]);
}
-
// drawImages(shot);
-
playerPosition(); //updaterar spelaren
playField.drawImage(player,strafeX,0,player.width,player.height,player.PositionValueX,player.PositionValueY,player.width,player.height);
@@ -570,84 +670,175 @@ function startGame(level) {
{
console.log("AMMO!");
ammoLeft += 10;
- delete upgrades[item]
+ reload.play();
+ reload.currentTime=0;
+ delete upgrades[item];
}
else if(distanceBetweenPlayerAndUpgrade>-marginal && distanceBetweenPlayerAndUpgrade-marginal && distanceBetweenPlayerAndUpgrade-marginal && distanceBetweenPlayerAndUpgrade 4){
+
+ gameCompleteSound.play();
+ gameCompleteSound.currentTime = 0;
+
+ clearInterval(startUpdate);
+ clearInterval(startTime);
+
+ totalShotsFiredHS.innerHTML = totalShotsFired.innerHTML;
+ shotsFiredHS.innerHTML = shotsFired.innerHTML;
+ specialShotsFiredHS.innerHTML = specialShotsFired.innerHTML;
+ collisionCounterHS.innerHTML = collisionCounter.innerHTML;
+
+ hiddentotalShotsFiredHS.value=totalShotsFired.innerHTML;
+ hiddenshotsFiredHS.value = shotsFired.innerHTML;
+ hiddenspecialShotsFired.value=specialShotsFired.innerHTML;
+ hiddencollisionCounter.value=collisionCounter.innerHTML;
+
+ levelInfo.style.display="none";
+ infoContainer.style.display ="block";
+ highscoreSignUpContainer.style.display="block";
+
+
+ lockPlayer = true;
+ restart = true;
+ }
}
function checkHealth(health)
{
- if(health<0)
+ if(health <= 0)
{
+ gameOverSound.play();
+ gameOverSound.currentTime = 0;
+
+
clearInterval(startUpdate);
clearInterval(startTime);
- playField.fillStyle = "Red";
- playField.font = "bold 56px Arial";
- playField.textAlign = "center";
- playField.fillText("Game Over :(", playfieldWidth/2, playfieldHeight/2);
+ infoContainer.style.display = "block";
+
+ button.className ="gameOverButton";
+ statusText.innerHTML = "You died!";
+ infoContainer.style.backgroundColor = redColor;
+ buttonText.innerHTML = "Restart";
+ restart = true;
+ lockPlayer = true;
}
}
var startUpdate = setInterval(update, 20);
-
var startTime = setInterval(function(){
- if(updateTime() % 10 == 0)
+ if(updateTime() === 1)
{
- addBalls(bigBallRadius, 100, 100, firstBallSpeed);
-
+ for(var l = 0; l < level; l++){
+ addBalls(bigBallRadius, (Math.floor(Math.random() * 9) + 1) *100, 100, ballSpeed,0);
+ }
+ }
+ if(timer.innerHTML % 10 === 0 && j <= level)
+ {
+ addBalls(bigBallRadius, (Math.floor(Math.random() * 9) + 1) *100, 100, ballSpeed,0);
+ j++;
}
- else if(timer.innerHTML % 7 == 0)
+ else if(timer.innerHTML % ammoGenerate === 0 && levelComplete != true)
{
addUpgrades(50, 50, "Ammo", ammoImage);
}
- else if(timer.innerHTML % 13 == 0)
+ else if(timer.innerHTML % healthGenerate === 0 && player.health < 100 && levelComplete != true)
{
addUpgrades(50, 50, "Health", healthImage);
}
- else if(timer.innerHTML % 31 == 0)
+ if(timer.innerHTML % specialAmmoGenerate === 0 && levelComplete != true && hitPerLevel>10)
{
- addUpgrades(50, 50, "PowerSot", ammoImage);
+ addUpgrades(50, 50, "PowerShot", powerAmmoImage);
}
- else if(timer.innerHTML % 5 == 0)
+ else if(timer.innerHTML % 5 === 0)
{
deleteUpgrades();
}
+ else if(j === level + 1 && Object.keys(bouncingBalls).length === 0){
+ levelComplete = true;
+ }
},1000);
-
setInterval(function(){
- updateFrameCount()
- },200);
+ updateFrameCount();
+ },100);
}
-startGame(1);
-
-
-
-
+button.addEventListener("click", function(){
+ if(restart === true){
+ location.reload();
+ }
+ else{
+ levelCompleteSound.play();
+ levelCompleteSound.currentTime=0;
+ level++;
+ bouncingBalls = {};
+ time = 0;
+ j = 0;
+ levelComplete = false;
+ infoContainer.style.display = "none";
+ ballSpeed +=0.7;
+ healthGenerate +=6;
+ ammoGenerate +=10;
+ specialAmmoGenerate +=8;
+ lockPlayer = false;
+ playFieldBackground.style.background = 'url("images/' + backGrounds[level-1] + '")';
+ }
+});
diff --git a/sound/bang.wav b/sound/bang.wav
new file mode 100644
index 0000000..8ca7af6
Binary files /dev/null and b/sound/bang.wav differ
diff --git a/sound/boo.mp3 b/sound/boo.mp3
new file mode 100644
index 0000000..b983c5e
Binary files /dev/null and b/sound/boo.mp3 differ
diff --git a/sound/damageSound.wav b/sound/damageSound.wav
new file mode 100755
index 0000000..c5160d3
Binary files /dev/null and b/sound/damageSound.wav differ
diff --git a/sound/gameComplete.mp3 b/sound/gameComplete.mp3
new file mode 100755
index 0000000..5c61b6a
Binary files /dev/null and b/sound/gameComplete.mp3 differ
diff --git a/sound/getHealth.wav b/sound/getHealth.wav
new file mode 100644
index 0000000..bef46df
Binary files /dev/null and b/sound/getHealth.wav differ
diff --git a/sound/gunshot.wav b/sound/gunshot.wav
new file mode 100644
index 0000000..f322dff
Binary files /dev/null and b/sound/gunshot.wav differ
diff --git a/sound/loudgun.wav b/sound/loudgun.wav
new file mode 100644
index 0000000..64e83c1
Binary files /dev/null and b/sound/loudgun.wav differ
diff --git a/sound/nicework.wav b/sound/nicework.wav
new file mode 100755
index 0000000..6d799a4
Binary files /dev/null and b/sound/nicework.wav differ
diff --git a/sound/pop.wav b/sound/pop.wav
new file mode 100644
index 0000000..95dca39
Binary files /dev/null and b/sound/pop.wav differ
diff --git a/sound/reload.wav b/sound/reload.wav
new file mode 100644
index 0000000..cee2999
Binary files /dev/null and b/sound/reload.wav differ
diff --git a/sound/shotgunreload.wav b/sound/shotgunreload.wav
new file mode 100755
index 0000000..cc1e28b
Binary files /dev/null and b/sound/shotgunreload.wav differ
+ 
+ 
+ 
+ 
+
+
+
+
+
+
+
+
diff --git a/highscore.php b/highscore.php
new file mode 100644
index 0000000..27e3ef6
--- /dev/null
+++ b/highscore.php
@@ -0,0 +1,69 @@
+
+ prepare($query);
+ $ps->execute();
+ }
+ catch (Exception $e)
+ {
+ echo $e->getMessage();
+ }
+ return $ps->fetchAll(PDO::FETCH_ASSOC);
+}
+?>
+
+
+
+
+