diff --git a/css/login.css b/css/login.css index 43e53f6..8a23421 100644 --- a/css/login.css +++ b/css/login.css @@ -1,5 +1,5 @@ body { - background-image: url("../images/wool.jpg"); + background: #310609; } #login { diff --git a/css/main.css b/css/main.css index 08a5878..dc75321 100644 --- a/css/main.css +++ b/css/main.css @@ -7,7 +7,7 @@ } body { - background-image: url("../images/wool.jpg"); + background: #310609; } #itemcount { @@ -27,6 +27,43 @@ body { background-image: url(../images/infobg.png); } +#oretiers { + position: fixed; + border: 1px, solid, black; + border: solid; + border-color: yellow; + background-image: url(../images/infobg.png); + width: 1192; + height: 568; + overflow-y: scroll; + padding: 4; +} + +#oretiers h1 { + font-size: 40px; + display: inline; + font-family: 'Electrolize', sans-serif; +} + +#help { + width: 1200; + height: 864; + position: fixed; + z-index: 100; + background-image: url(../images/helpoverlay.png); +} + +#oretiers h2 { + font-size: 31px; + display: inline; + font-family: 'Electrolize', sans-serif; + padding-left: 6px; + padding-top: 4.5px; + padding-right: 6px; + display: inline; + height: 40px; +} + #buildselect { position: fixed; border: 1px, solid, black; @@ -224,8 +261,8 @@ width: 100% height: 42px; line-height: 42px; text-align: center; - background-image: url(../images/moneybg.png); z-index: -1; + color: floralwhite; } .itemBig { diff --git a/game.html b/game.html index 4362d9f..9be7124 100644 --- a/game.html +++ b/game.html @@ -13,7 +13,9 @@ + + @@ -23,7 +25,7 @@ - +
+
+
+
diff --git a/images/helpoverlay.png b/images/helpoverlay.png new file mode 100644 index 0000000..e93213b Binary files /dev/null and b/images/helpoverlay.png differ diff --git a/images/ui/help.png b/images/ui/help.png new file mode 100644 index 0000000..5fa59ee Binary files /dev/null and b/images/ui/help.png differ diff --git a/index.html b/index.html index 0f9f7ed..3b9d34c 100644 --- a/index.html +++ b/index.html @@ -11,11 +11,13 @@ + + - +


Username:



diff --git a/js/background.js b/js/background.js new file mode 100644 index 0000000..9aeaaea --- /dev/null +++ b/js/background.js @@ -0,0 +1,3 @@ +particlesJS.load('body', 'js/particles.json', function() { + console.log('callback - particles.js config loaded'); +}); diff --git a/js/game.js b/js/game.js index 1572505..722af51 100644 --- a/js/game.js +++ b/js/game.js @@ -32,6 +32,7 @@ var renderItems = true var playername = "Player" var lastsave = 0 +var saving = false $(document).ready(function() { $("#forcesave").click(function() { @@ -64,6 +65,7 @@ $(window).on("beforeunload", function() { }) function save() { + console.log("saving...") game = {} game.money = money game.gametime = gametime @@ -114,6 +116,7 @@ function save() { console.log(result) if (JSON.parse(result).status == "succes") { lastsave = new Date().getTime() + saving = false } } }); @@ -239,7 +242,8 @@ function gametick(timestep) { tick = tick.splice(1) $("#speed").html("Game Speed: " + ((tick[47] - tick[0] + 30) / 10) + "%
" + version) } - if (Math.round((new Date().getTime() - lastsave) / 60000) > 5 && lastsave != 0) { + if (!saving && Math.round((new Date().getTime() - lastsave) / 60000) > 5 && lastsave != 0) { + saving = true save() } } @@ -393,7 +397,20 @@ function prepairRender() { tilesLoaded++ } console.log(tilesLoaded + "/" + tileClasses.length + " Tiles Loaded!") + console.log("Loading Oretiers") + for(var i = 1;i<9;i++){ + $('#oretiers').append("

"+lang.depth+" "+i+":

"); + for(var j=0;j"+lang.minerals[j]+""); + } + } + + $('#oretiers').append("
"); + } $('#buildselect').hide() + $('#oretiers').hide() + $('#help').hide() $('#inventoryBig').hide() $('#selectItem').hide() $('#options').hide() @@ -422,17 +439,18 @@ function prepairRender() { function() { //ENTER var id = $(this).attr("id"); - if (id.startsWith("itemBig_") || id.startsWith("itemSel_")) { - id = parseInt(id.substr(8)) - if ($(this).attr("id").startsWith("itemBig_")) - if (id < itemId.length) { - id = itemId[id] - } else return - hoverTooltip = true - $('#tooltip').text(lang.items[id] + " (" + formatCount(items[id].value) + " " + lang.money + ")") - $('#tooltip').show() - tooltip = true - } + if (id != undefined) + if (id.startsWith("itemBig_") || id.startsWith("itemSel_")) { + id = parseInt(id.substr(8)) + if ($(this).attr("id").startsWith("itemBig_")) + if (id < itemId.length) { + id = itemId[id] + } else return + hoverTooltip = true + $('#tooltip').text(lang.items[id] + " (" + formatCount(items[id].value) + " " + lang.money + ")") + $('#tooltip').show() + tooltip = true + } }, function() { //LEAVE @@ -442,14 +460,16 @@ function prepairRender() { $('canvas').click( function() { var id = $(this).attr("id"); - if (id.startsWith("itemBig_")) { - id = parseInt(id.substr(8)) - if (id < itemId.length) { - if (inventory.take(itemId[id], 1)) { - money += items[itemId[id]].value + if (id != undefined) + if (id.startsWith("itemBig_")) { + id = parseInt(id.substr(8)) + if (id < itemId.length) { + var idd = itemId[id] + if (inventory.take(itemId[id], 1)) { + money += items[idd].value + } } } - } }) //End Sell/Select Items Menu $('#clickToSell').text(lang.clickToSell) @@ -464,7 +484,7 @@ function prepairRender() { } } -var infoBarIcons = ["build.png", "move.png", "rotate.png", "delete.png", null, "upgrade.png", "info.png", null, "factorys.png"] +var infoBarIcons = ["build.png", "move.png", "rotate.png", "delete.png", null, "help.png", "info.png", null, "factorys.png"] var infoBarIconsImg = [] var infoGlowOpacity = 0 diff --git a/js/items.json b/js/items.json index 06b97d1..12968cc 100644 --- a/js/items.json +++ b/js/items.json @@ -245,14 +245,14 @@ "oreid": 15 }, "diamonds": { - "depth": 8 + "depth": 7 }, "iron": { "depth": 1, "oreid": 16 }, "naturalgas": { - "depth": 6, + "depth": 5, "liquid": true }, "oil": { @@ -307,7 +307,7 @@ "depth": 1 }, "rubies": { - "depth": 9 + "depth": 8 }, "silver": { "depth": 4, diff --git a/js/libs/particles.min.js b/js/libs/particles.min.js new file mode 100644 index 0000000..32e2f6e --- /dev/null +++ b/js/libs/particles.min.js @@ -0,0 +1,8 @@ +/** + * Minified by jsDelivr using UglifyJS v3.1.10. + * Original file: /npm/particles.js@2.0.0/particles.js + * + * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files + */ +function hexToRgb(e){e=e.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i,function(e,a,t,i){return a+a+t+t+i+i});var a=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return a?{r:parseInt(a[1],16),g:parseInt(a[2],16),b:parseInt(a[3],16)}:null}function clamp(e,a,t){return Math.min(Math.max(e,a),t)}function isInArray(e,a){return a.indexOf(e)>-1}var pJS=function(e,a){var t=document.querySelector("#"+e+" > .particles-js-canvas-el");this.pJS={canvas:{el:t,w:t.offsetWidth,h:t.offsetHeight},particles:{number:{value:400,density:{enable:!0,value_area:800}},color:{value:"#fff"},shape:{type:"circle",stroke:{width:0,color:"#ff0000"},polygon:{nb_sides:5},image:{src:"",width:100,height:100}},opacity:{value:1,random:!1,anim:{enable:!1,speed:2,opacity_min:0,sync:!1}},size:{value:20,random:!1,anim:{enable:!1,speed:20,size_min:0,sync:!1}},line_linked:{enable:!0,distance:100,color:"#fff",opacity:1,width:1},move:{enable:!0,speed:2,direction:"none",random:!1,straight:!1,out_mode:"out",bounce:!1,attract:{enable:!1,rotateX:3e3,rotateY:3e3}},array:[]},interactivity:{detect_on:"canvas",events:{onhover:{enable:!0,mode:"grab"},onclick:{enable:!0,mode:"push"},resize:!0},modes:{grab:{distance:100,line_linked:{opacity:1}},bubble:{distance:200,size:80,duration:.4},repulse:{distance:200,duration:.4},push:{particles_nb:4},remove:{particles_nb:2}},mouse:{}},retina_detect:!1,fn:{interact:{},modes:{},vendors:{}},tmp:{}};var i=this.pJS;a&&Object.deepExtend(i,a),i.tmp.obj={size_value:i.particles.size.value,size_anim_speed:i.particles.size.anim.speed,move_speed:i.particles.move.speed,line_linked_distance:i.particles.line_linked.distance,line_linked_width:i.particles.line_linked.width,mode_grab_distance:i.interactivity.modes.grab.distance,mode_bubble_distance:i.interactivity.modes.bubble.distance,mode_bubble_size:i.interactivity.modes.bubble.size,mode_repulse_distance:i.interactivity.modes.repulse.distance},i.fn.retinaInit=function(){i.retina_detect&&window.devicePixelRatio>1?(i.canvas.pxratio=window.devicePixelRatio,i.tmp.retina=!0):(i.canvas.pxratio=1,i.tmp.retina=!1),i.canvas.w=i.canvas.el.offsetWidth*i.canvas.pxratio,i.canvas.h=i.canvas.el.offsetHeight*i.canvas.pxratio,i.particles.size.value=i.tmp.obj.size_value*i.canvas.pxratio,i.particles.size.anim.speed=i.tmp.obj.size_anim_speed*i.canvas.pxratio,i.particles.move.speed=i.tmp.obj.move_speed*i.canvas.pxratio,i.particles.line_linked.distance=i.tmp.obj.line_linked_distance*i.canvas.pxratio,i.interactivity.modes.grab.distance=i.tmp.obj.mode_grab_distance*i.canvas.pxratio,i.interactivity.modes.bubble.distance=i.tmp.obj.mode_bubble_distance*i.canvas.pxratio,i.particles.line_linked.width=i.tmp.obj.line_linked_width*i.canvas.pxratio,i.interactivity.modes.bubble.size=i.tmp.obj.mode_bubble_size*i.canvas.pxratio,i.interactivity.modes.repulse.distance=i.tmp.obj.mode_repulse_distance*i.canvas.pxratio},i.fn.canvasInit=function(){i.canvas.ctx=i.canvas.el.getContext("2d")},i.fn.canvasSize=function(){i.canvas.el.width=i.canvas.w,i.canvas.el.height=i.canvas.h,i&&i.interactivity.events.resize&&window.addEventListener("resize",function(){i.canvas.w=i.canvas.el.offsetWidth,i.canvas.h=i.canvas.el.offsetHeight,i.tmp.retina&&(i.canvas.w*=i.canvas.pxratio,i.canvas.h*=i.canvas.pxratio),i.canvas.el.width=i.canvas.w,i.canvas.el.height=i.canvas.h,i.particles.move.enable||(i.fn.particlesEmpty(),i.fn.particlesCreate(),i.fn.particlesDraw(),i.fn.vendors.densityAutoParticles()),i.fn.vendors.densityAutoParticles()})},i.fn.canvasPaint=function(){i.canvas.ctx.fillRect(0,0,i.canvas.w,i.canvas.h)},i.fn.canvasClear=function(){i.canvas.ctx.clearRect(0,0,i.canvas.w,i.canvas.h)},i.fn.particle=function(e,a,t){if(this.radius=(i.particles.size.random?Math.random():1)*i.particles.size.value,i.particles.size.anim.enable&&(this.size_status=!1,this.vs=i.particles.size.anim.speed/100,i.particles.size.anim.sync||(this.vs=this.vs*Math.random())),this.x=t?t.x:Math.random()*i.canvas.w,this.y=t?t.y:Math.random()*i.canvas.h,this.x>i.canvas.w-2*this.radius?this.x=this.x-this.radius:this.x<2*this.radius&&(this.x=this.x+this.radius),this.y>i.canvas.h-2*this.radius?this.y=this.y-this.radius:this.y<2*this.radius&&(this.y=this.y+this.radius),i.particles.move.bounce&&i.fn.vendors.checkOverlap(this,t),this.color={},"object"==typeof e.value)if(e.value instanceof Array){var s=e.value[Math.floor(Math.random()*i.particles.color.value.length)];this.color.rgb=hexToRgb(s)}else void 0!=e.value.r&&void 0!=e.value.g&&void 0!=e.value.b&&(this.color.rgb={r:e.value.r,g:e.value.g,b:e.value.b}),void 0!=e.value.h&&void 0!=e.value.s&&void 0!=e.value.l&&(this.color.hsl={h:e.value.h,s:e.value.s,l:e.value.l});else"random"==e.value?this.color.rgb={r:Math.floor(256*Math.random())+0,g:Math.floor(256*Math.random())+0,b:Math.floor(256*Math.random())+0}:"string"==typeof e.value&&(this.color=e,this.color.rgb=hexToRgb(this.color.value));this.opacity=(i.particles.opacity.random?Math.random():1)*i.particles.opacity.value,i.particles.opacity.anim.enable&&(this.opacity_status=!1,this.vo=i.particles.opacity.anim.speed/100,i.particles.opacity.anim.sync||(this.vo=this.vo*Math.random()));var n={};switch(i.particles.move.direction){case"top":n={x:0,y:-1};break;case"top-right":n={x:.5,y:-.5};break;case"right":n={x:1,y:-0};break;case"bottom-right":n={x:.5,y:.5};break;case"bottom":n={x:0,y:1};break;case"bottom-left":n={x:-.5,y:1};break;case"left":n={x:-1,y:0};break;case"top-left":n={x:-.5,y:-.5};break;default:n={x:0,y:0}}i.particles.move.straight?(this.vx=n.x,this.vy=n.y,i.particles.move.random&&(this.vx=this.vx*Math.random(),this.vy=this.vy*Math.random())):(this.vx=n.x+Math.random()-.5,this.vy=n.y+Math.random()-.5),this.vx_i=this.vx,this.vy_i=this.vy;var r=i.particles.shape.type;if("object"==typeof r){if(r instanceof Array){var c=r[Math.floor(Math.random()*r.length)];this.shape=c}}else this.shape=r;if("image"==this.shape){var o=i.particles.shape;this.img={src:o.image.src,ratio:o.image.width/o.image.height},this.img.ratio||(this.img.ratio=1),"svg"==i.tmp.img_type&&void 0!=i.tmp.source_svg&&(i.fn.vendors.createSvgImg(this),i.tmp.pushing&&(this.img.loaded=!1))}},i.fn.particle.prototype.draw=function(){var e=this;if(void 0!=e.radius_bubble)a=e.radius_bubble;else var a=e.radius;if(void 0!=e.opacity_bubble)t=e.opacity_bubble;else var t=e.opacity;if(e.color.rgb)s="rgba("+e.color.rgb.r+","+e.color.rgb.g+","+e.color.rgb.b+","+t+")";else var s="hsla("+e.color.hsl.h+","+e.color.hsl.s+"%,"+e.color.hsl.l+"%,"+t+")";switch(i.canvas.ctx.fillStyle=s,i.canvas.ctx.beginPath(),e.shape){case"circle":i.canvas.ctx.arc(e.x,e.y,a,0,2*Math.PI,!1);break;case"edge":i.canvas.ctx.rect(e.x-a,e.y-a,2*a,2*a);break;case"triangle":i.fn.vendors.drawShape(i.canvas.ctx,e.x-a,e.y+a/1.66,2*a,3,2);break;case"polygon":i.fn.vendors.drawShape(i.canvas.ctx,e.x-a/(i.particles.shape.polygon.nb_sides/3.5),e.y-a/.76,2.66*a/(i.particles.shape.polygon.nb_sides/3),i.particles.shape.polygon.nb_sides,1);break;case"star":i.fn.vendors.drawShape(i.canvas.ctx,e.x-2*a/(i.particles.shape.polygon.nb_sides/4),e.y-a/1.52,2*a*2.66/(i.particles.shape.polygon.nb_sides/3),i.particles.shape.polygon.nb_sides,2);break;case"image":if("svg"==i.tmp.img_type)n=e.img.obj;else var n=i.tmp.img_obj;n&&i.canvas.ctx.drawImage(n,e.x-a,e.y-a,2*a,2*a/e.img.ratio)}i.canvas.ctx.closePath(),i.particles.shape.stroke.width>0&&(i.canvas.ctx.strokeStyle=i.particles.shape.stroke.color,i.canvas.ctx.lineWidth=i.particles.shape.stroke.width,i.canvas.ctx.stroke()),i.canvas.ctx.fill()},i.fn.particlesCreate=function(){for(var e=0;e=i.particles.opacity.value&&(a.opacity_status=!1),a.opacity+=a.vo):(a.opacity<=i.particles.opacity.anim.opacity_min&&(a.opacity_status=!0),a.opacity-=a.vo),a.opacity<0&&(a.opacity=0)),i.particles.size.anim.enable&&(1==a.size_status?(a.radius>=i.particles.size.value&&(a.size_status=!1),a.radius+=a.vs):(a.radius<=i.particles.size.anim.size_min&&(a.size_status=!0),a.radius-=a.vs),a.radius<0&&(a.radius=0)),"bounce"==i.particles.move.out_mode)s={x_left:a.radius,x_right:i.canvas.w,y_top:a.radius,y_bottom:i.canvas.h};else var s={x_left:-a.radius,x_right:i.canvas.w+a.radius,y_top:-a.radius,y_bottom:i.canvas.h+a.radius};switch(a.x-a.radius>i.canvas.w?(a.x=s.x_left,a.y=Math.random()*i.canvas.h):a.x+a.radius<0&&(a.x=s.x_right,a.y=Math.random()*i.canvas.h),a.y-a.radius>i.canvas.h?(a.y=s.y_top,a.x=Math.random()*i.canvas.w):a.y+a.radius<0&&(a.y=s.y_bottom,a.x=Math.random()*i.canvas.w),i.particles.move.out_mode){case"bounce":a.x+a.radius>i.canvas.w?a.vx=-a.vx:a.x-a.radius<0&&(a.vx=-a.vx),a.y+a.radius>i.canvas.h?a.vy=-a.vy:a.y-a.radius<0&&(a.vy=-a.vy)}if(isInArray("grab",i.interactivity.events.onhover.mode)&&i.fn.modes.grabParticle(a),(isInArray("bubble",i.interactivity.events.onhover.mode)||isInArray("bubble",i.interactivity.events.onclick.mode))&&i.fn.modes.bubbleParticle(a),(isInArray("repulse",i.interactivity.events.onhover.mode)||isInArray("repulse",i.interactivity.events.onclick.mode))&&i.fn.modes.repulseParticle(a),i.particles.line_linked.enable||i.particles.move.attract.enable)for(var n=e+1;n0){var c=i.particles.line_linked.color_rgb_line;i.canvas.ctx.strokeStyle="rgba("+c.r+","+c.g+","+c.b+","+r+")",i.canvas.ctx.lineWidth=i.particles.line_linked.width,i.canvas.ctx.beginPath(),i.canvas.ctx.moveTo(e.x,e.y),i.canvas.ctx.lineTo(a.x,a.y),i.canvas.ctx.stroke(),i.canvas.ctx.closePath()}}},i.fn.interact.attractParticles=function(e,a){var t=e.x-a.x,s=e.y-a.y;if(Math.sqrt(t*t+s*s)<=i.particles.line_linked.distance){var n=t/(1e3*i.particles.move.attract.rotateX),r=s/(1e3*i.particles.move.attract.rotateY);e.vx-=n,e.vy-=r,a.vx+=n,a.vy+=r}},i.fn.interact.bounceParticles=function(e,a){var t=e.x-a.x,i=e.y-a.y;Math.sqrt(t*t+i*i)<=e.radius+a.radius&&(e.vx=-e.vx,e.vy=-e.vy,a.vx=-a.vx,a.vy=-a.vy)},i.fn.modes.pushParticles=function(e,a){i.tmp.pushing=!0;for(var t=0;t=0&&"mousemove"==i.interactivity.status){if(i.interactivity.modes.bubble.size!=i.particles.size.value)if(i.interactivity.modes.bubble.size>i.particles.size.value){(o=e.radius+i.interactivity.modes.bubble.size*r)>=0&&(e.radius_bubble=o)}else{var c=e.radius-i.interactivity.modes.bubble.size,o=e.radius-c*r;e.radius_bubble=o>0?o:0}if(i.interactivity.modes.bubble.opacity!=i.particles.opacity.value)if(i.interactivity.modes.bubble.opacity>i.particles.opacity.value){(l=i.interactivity.modes.bubble.opacity*r)>e.opacity&&l<=i.interactivity.modes.bubble.opacity&&(e.opacity_bubble=l)}else{var l=e.opacity-(i.particles.opacity.value-i.interactivity.modes.bubble.opacity)*r;l=i.interactivity.modes.bubble.opacity&&(e.opacity_bubble=l)}}}else a();"mouseleave"==i.interactivity.status&&a()}else if(i.interactivity.events.onclick.enable&&isInArray("bubble",i.interactivity.events.onclick.mode)){if(i.tmp.bubble_clicking){var s=e.x-i.interactivity.mouse.click_pos_x,n=e.y-i.interactivity.mouse.click_pos_y,v=Math.sqrt(s*s+n*n),p=((new Date).getTime()-i.interactivity.mouse.click_time)/1e3;p>i.interactivity.modes.bubble.duration&&(i.tmp.bubble_duration_end=!0),p>2*i.interactivity.modes.bubble.duration&&(i.tmp.bubble_clicking=!1,i.tmp.bubble_duration_end=!1)}i.tmp.bubble_clicking&&(t(i.interactivity.modes.bubble.size,i.particles.size.value,e.radius_bubble,e.radius,"size"),t(i.interactivity.modes.bubble.opacity,i.particles.opacity.value,e.opacity_bubble,e.opacity,"opacity"))}},i.fn.modes.repulseParticle=function(e){if(i.interactivity.events.onhover.enable&&isInArray("repulse",i.interactivity.events.onhover.mode)&&"mousemove"==i.interactivity.status){var a=e.x-i.interactivity.mouse.pos_x,t=e.y-i.interactivity.mouse.pos_y,s=Math.sqrt(a*a+t*t),n={x:a/s,y:t/s},r=clamp(1/(o=i.interactivity.modes.repulse.distance)*(-1*Math.pow(s/o,2)+1)*o*100,0,50),c={x:e.x+n.x*r,y:e.y+n.y*r};"bounce"==i.particles.move.out_mode?(c.x-e.radius>0&&c.x+e.radius0&&c.y+e.radiusi.canvas.w?e.vx=-e.vx:t.x-e.radius<0&&(e.vx=-e.vx),t.y+e.radius>i.canvas.h?e.vy=-e.vy:t.y-e.radius<0&&(e.vy=-e.vy)}}()}else 0==i.tmp.repulse_clicking&&(e.vx=e.vx_i,e.vy=e.vy_i)},i.fn.modes.grabParticle=function(e){if(i.interactivity.events.onhover.enable&&"mousemove"==i.interactivity.status){var a=e.x-i.interactivity.mouse.pos_x,t=e.y-i.interactivity.mouse.pos_y,s=Math.sqrt(a*a+t*t);if(s<=i.interactivity.modes.grab.distance){var n=i.interactivity.modes.grab.line_linked.opacity-s/(1/i.interactivity.modes.grab.line_linked.opacity)/i.interactivity.modes.grab.distance;if(n>0){var r=i.particles.line_linked.color_rgb_line;i.canvas.ctx.strokeStyle="rgba("+r.r+","+r.g+","+r.b+","+n+")",i.canvas.ctx.lineWidth=i.particles.line_linked.width,i.canvas.ctx.beginPath(),i.canvas.ctx.moveTo(e.x,e.y),i.canvas.ctx.lineTo(i.interactivity.mouse.pos_x,i.interactivity.mouse.pos_y),i.canvas.ctx.stroke(),i.canvas.ctx.closePath()}}}},i.fn.vendors.eventsListeners=function(){"window"==i.interactivity.detect_on?i.interactivity.el=window:i.interactivity.el=i.canvas.el,(i.interactivity.events.onhover.enable||i.interactivity.events.onclick.enable)&&(i.interactivity.el.addEventListener("mousemove",function(e){if(i.interactivity.el==window)var a=e.clientX,t=e.clientY;else var a=e.offsetX||e.clientX,t=e.offsetY||e.clientY;i.interactivity.mouse.pos_x=a,i.interactivity.mouse.pos_y=t,i.tmp.retina&&(i.interactivity.mouse.pos_x*=i.canvas.pxratio,i.interactivity.mouse.pos_y*=i.canvas.pxratio),i.interactivity.status="mousemove"}),i.interactivity.el.addEventListener("mouseleave",function(e){i.interactivity.mouse.pos_x=null,i.interactivity.mouse.pos_y=null,i.interactivity.status="mouseleave"})),i.interactivity.events.onclick.enable&&i.interactivity.el.addEventListener("click",function(){if(i.interactivity.mouse.click_pos_x=i.interactivity.mouse.pos_x,i.interactivity.mouse.click_pos_y=i.interactivity.mouse.pos_y,i.interactivity.mouse.click_time=(new Date).getTime(),i.interactivity.events.onclick.enable)switch(i.interactivity.events.onclick.mode){case"push":i.particles.move.enable?i.fn.modes.pushParticles(i.interactivity.modes.push.particles_nb,i.interactivity.mouse):1==i.interactivity.modes.push.particles_nb?i.fn.modes.pushParticles(i.interactivity.modes.push.particles_nb,i.interactivity.mouse):i.interactivity.modes.push.particles_nb>1&&i.fn.modes.pushParticles(i.interactivity.modes.push.particles_nb);break;case"remove":i.fn.modes.removeParticles(i.interactivity.modes.remove.particles_nb);break;case"bubble":i.tmp.bubble_clicking=!0;break;case"repulse":i.tmp.repulse_clicking=!0,i.tmp.repulse_count=0,i.tmp.repulse_finish=!1,setTimeout(function(){i.tmp.repulse_clicking=!1},1e3*i.interactivity.modes.repulse.duration)}})},i.fn.vendors.densityAutoParticles=function(){if(i.particles.number.density.enable){var e=i.canvas.el.width*i.canvas.el.height/1e3;i.tmp.retina&&(e/=2*i.canvas.pxratio);var a=e*i.particles.number.value/i.particles.number.density.value_area,t=i.particles.array.length-a;t<0?i.fn.modes.pushParticles(Math.abs(t)):i.fn.modes.removeParticles(t)}},i.fn.vendors.checkOverlap=function(e,a){for(var t=0;t=i.particles.number.value?(i.fn.particlesDraw(),i.particles.move.enable?i.fn.drawAnimFrame=requestAnimFrame(i.fn.vendors.draw):cancelRequestAnimFrame(i.fn.drawAnimFrame)):i.tmp.img_error||(i.fn.drawAnimFrame=requestAnimFrame(i.fn.vendors.draw)):void 0!=i.tmp.img_obj?(i.fn.particlesDraw(),i.particles.move.enable?i.fn.drawAnimFrame=requestAnimFrame(i.fn.vendors.draw):cancelRequestAnimFrame(i.fn.drawAnimFrame)):i.tmp.img_error||(i.fn.drawAnimFrame=requestAnimFrame(i.fn.vendors.draw)):(i.fn.particlesDraw(),i.particles.move.enable?i.fn.drawAnimFrame=requestAnimFrame(i.fn.vendors.draw):cancelRequestAnimFrame(i.fn.drawAnimFrame))},i.fn.vendors.checkBeforeDraw=function(){"image"==i.particles.shape.type?"svg"==i.tmp.img_type&&void 0==i.tmp.source_svg?i.tmp.checkAnimFrame=requestAnimFrame(check):(cancelRequestAnimFrame(i.tmp.checkAnimFrame),i.tmp.img_error||(i.fn.vendors.init(),i.fn.vendors.draw())):(i.fn.vendors.init(),i.fn.vendors.draw())},i.fn.vendors.init=function(){i.fn.retinaInit(),i.fn.canvasInit(),i.fn.canvasSize(),i.fn.canvasPaint(),i.fn.particlesCreate(),i.fn.vendors.densityAutoParticles(),i.particles.line_linked.color_rgb_line=hexToRgb(i.particles.line_linked.color)},i.fn.vendors.start=function(){isInArray("image",i.particles.shape.type)?(i.tmp.img_type=i.particles.shape.image.src.substr(i.particles.shape.image.src.length-3),i.fn.vendors.loadImg(i.tmp.img_type)):i.fn.vendors.checkBeforeDraw()},i.fn.vendors.eventsListeners(),i.fn.vendors.start()};Object.deepExtend=function(e,a){for(var t in a)a[t]&&a[t].constructor&&a[t].constructor===Object?(e[t]=e[t]||{},arguments.callee(e[t],a[t])):e[t]=a[t];return e},window.requestAnimFrame=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)},window.cancelRequestAnimFrame=window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout,window.pJSDom=[],window.particlesJS=function(e,a){"string"!=typeof e&&(a=e,e="particles-js"),e||(e="particles-js");var t=document.getElementById(e),i=t.getElementsByClassName("particles-js-canvas-el");if(i.length)for(;i.length>0;)t.removeChild(i[0]);var s=document.createElement("canvas");s.className="particles-js-canvas-el",s.style.width="100%",s.style.height="100%";null!=document.getElementById(e).appendChild(s)&&pJSDom.push(new pJS(e,a))},window.particlesJS.load=function(e,a,t){var i=new XMLHttpRequest;i.open("GET",a),i.onreadystatechange=function(a){if(4==i.readyState)if(200==i.status){var s=JSON.parse(a.currentTarget.response);window.particlesJS(e,s),t&&t()}else console.log("Error pJS - XMLHttpRequest status: "+i.status),console.log("Error pJS - File config not found")},i.send()}; +//# sourceMappingURL=/sm/bda29ab2bcfefcd0049eeb5b194abe473582be210aac113cd8b6dfb032a1e30b.map \ No newline at end of file diff --git a/js/particles.json b/js/particles.json new file mode 100644 index 0000000..61f33ff --- /dev/null +++ b/js/particles.json @@ -0,0 +1,110 @@ +{ + "particles": { + "number": { + "value": 80, + "density": { + "enable": true, + "value_area": 800 + } + }, + "color": { + "value": "#ffffff" + }, + "shape": { + "type": "circle", + "stroke": { + "width": 0, + "color": "#000000" + }, + "polygon": { + "nb_sides": 5 + }, + "image": { + "src": "img/github.svg", + "width": 100, + "height": 100 + } + }, + "opacity": { + "value": 0.5, + "random": false, + "anim": { + "enable": false, + "speed": 1, + "opacity_min": 0.1, + "sync": false + } + }, + "size": { + "value": 4, + "random": true, + "anim": { + "enable": true, + "speed": 5, + "size_min": 0.2, + "sync": true + } + }, + "line_linked": { + "enable": true, + "distance": 150, + "color": "#ffffff", + "opacity": 0.4, + "width": 1.4 + }, + "move": { + "enable": true, + "speed": 1.4, + "direction": "none", + "random": false, + "straight": false, + "out_mode": "out", + "bounce": false, + "attract": { + "enable": true, + "rotateX": 600, + "rotateY": 1200 + } + } + }, + "interactivity": { + "detect_on": "canvas", + "events": { + "onhover": { + "enable": true, + "mode": "repulse" + }, + "onclick": { + "enable": false, + "mode": "push" + }, + "resize": true + }, + "modes": { + "grab": { + "distance": 400, + "line_linked": { + "opacity": 1 + } + }, + "bubble": { + "distance": 400, + "size": 40, + "duration": 2, + "opacity": 8, + "speed": 3 + }, + "repulse": { + "distance": 60, + "duration": 0.4 + }, + "push": { + "particles_nb": 4 + }, + "remove": { + "particles_nb": 2 + } + } + }, + "retina_detect": true +} diff --git a/js/tiles.js b/js/tiles.js index 124fbff..08e1485 100644 --- a/js/tiles.js +++ b/js/tiles.js @@ -1315,11 +1315,11 @@ class FertilizerMixer extends Tile { work() { //Items für ein Pank - if (this.input.countOf(39) >= 30) { + if (this.input.countOf(34) >= 20) { if (this.currentwork == this.maxwork) { - this.input.take(39, 30, this.factory) + this.input.take(34, 20, this.factory) for (var i = 0; i < 10; i++) { - var item = new Item(42, this.x * 48, this.y * 48) + var item = new Item(43, this.x * 48, this.y * 48) this.factory.items.push(item) item.setDFromDirection(this.direction) this.currentwork = 0 diff --git a/js/userinterface.js b/js/userinterface.js index 3391c6e..47a55c0 100644 --- a/js/userinterface.js +++ b/js/userinterface.js @@ -25,6 +25,10 @@ function style() { $('#screen').css('margin-left', screenMarginLeft) $('#buildselect').css('margin-top', screenMarginTop) $('#buildselect').css('margin-left', screenMarginLeft) + $('#help').css('margin-top', screenMarginTop) + $('#help').css('margin-left', screenMarginLeft) + $('#oretiers').css('margin-top', screenMarginTop) + $('#oretiers').css('margin-left', screenMarginLeft) $('#selectFactory').css('margin-top', screenMarginTop) $('#selectFactory').css('margin-left', screenMarginLeft) $('#selectItem').css('margin-top', screenMarginTop) @@ -199,6 +203,24 @@ function clickEvents() { closeUi() } break + case 5: + //selectFactory BUTTON + if (mode == "none") { + mode = "help" + $('#help').fadeIn(200) + } else { + closeUi() + } + break + case 6: + //selectFactory BUTTON + if (mode == "none") { + mode = "oretiers" + $('#oretiers').fadeIn(200) + } else { + closeUi() + } + break case 8: //selectFactory BUTTON if (mode == "none") { @@ -514,6 +536,16 @@ function closeUi() { $('#selectFactory').fadeOut(200) return false } + if (mode == "oretiers") { + mode = "none" + $('#oretiers').fadeOut(200) + return false + } + if (mode == "help") { + mode = "none" + $('#help').fadeOut(200) + return false + } } function sort() { diff --git a/lang/en.json b/lang/en.json index 6db2484..89b0f93 100644 --- a/lang/en.json +++ b/lang/en.json @@ -18,7 +18,7 @@ }, "spliter": { "name": "Spliter", - "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "description": "Splits Items 50/50 to the left/right." }, "warehouse": { "name": "Warehouse", @@ -219,12 +219,13 @@ "more": "Show Inventory / Sell Items", "inventory": "Inventory", "player": "Player", - "infotooltips": ["Build", "Move", "Rotate", "Delete!", "", "Upgrade", "Information", "", "My Factorys"], + "infotooltips": ["Build", "Move", "Rotate", "Delete!", "", "Help!?", "Information", "", "My Factorys"], "cost": "Cost", "clickToSell": "Click on items to sell them.", "reroll": "Reroll Offers", "clickToBuyFactory": "Click on a Factory to Buy.", "money": "Dollars", "mineralslable": "Minerals:", + "depth": "Depth", "numbers": ["", " Thousand", " Million", " Billion", " Trillion", " Quadrillion", " Quintillion", " Sextillion", " Septillion", " Octillion", " Nonillion", " Decillion", " Undecillion", " Duodecillion", " Tredecillion", " Quattuordecillion", " Quindecillion", " Sexdecillion", " Septendecillion", " Octodecillion", " Novemdecillion", " Vigintillion"] }