From 9d4ae176ad1867959e3a29cff130e7e74fe1a8a9 Mon Sep 17 00:00:00 2001 From: Shaun Date: Tue, 6 Jun 2017 16:47:43 +0200 Subject: [PATCH] pixely light shafts --- src/client/images/characters.pyxel | Bin 5776 -> 5769 bytes src/client/index.html | 2 +- src/client/js/components/lightPatch.js | 30 +++++++++++- src/server/config/maps/cave/map.json | 63 +++++++++++++++++++++++-- 4 files changed, 90 insertions(+), 5 deletions(-) diff --git a/src/client/images/characters.pyxel b/src/client/images/characters.pyxel index 0c3b97691699aeca78340da2176269bfacd11f47..f6626e8d57e427c505fc341fd0eb19070f461878 100644 GIT binary patch delta 1686 zcmbQB+o@Y0;LXe;!oa}6!SK`Lm{8 zv3}OGI_pITgI%m|D6IXx>-UQkZNa>y>C4rxmFMjGooM#|@yiYGkMA%0b#Kr0xtaTA zs)F}lpPXOx-Rk`P8SIze@mpW+t^9XVr1Bom+R7`nQ=dD>KdZcHc6slyqY{(OI^EfB zwz&Swxu-LyMBjZ~Wb*gZlzRSW3CDY%t!?+ry33bVcn~*xGcK_vd>?ey3)XV$)zhS<3X7K-uJItO@bnjr*F9-HXN+W?>MT8wFfFn}SHyYa&i>c}zMDGT^^0Q| zv>ncGvN_e|%&Rf^jfQl9)TPKU_nlWJU6y)Sai;0Ru^EFfp#e!1LUtVVzt+(fZV7s{-e0@;~0X=0nAK?x;yjzuDqWMYbKU zj`N*q+4;V5DO>EqU5(G5GAt0eWUH^Sfa$BCQ@yuhR*3wEJyR1G1lk__EXFg#<)`xt zeTIiO!drg4>n=GTy-amV2e-}oMO-51E`R1q-LD}pRuRm{WSg(^VOoIklhZc(9v&Zy zk2=-YbE^J$n>5dSuARqo!C03P$%~si)}4E8)B8eY(d7<4LEA&8mG{`d38h2YN_(&o zMu)WhE7gDAT;JAT_x{kIuVy(>9W%-`$`cPx{&IX(#H)9X{HJ#>7KqufG>I^*JAJ58@)B_Ha`@<_2G5SlUB1w zrxqP-wR`0yU$*f4meAdYUL?)ej-US}Xuh_*dEv{))9yZd`|wr0nVr(!iTpb!^8d}X zTW#ETa@$I+%YS8TG@~wuzW;Vv(*EV0mz#aV^q;AxWIk1T9;SCHx%=A9HP8OL{4rV? z`lCAL+V0QC|GAX++IpD(&NK6UGqZBTsghlFN8=nfRsG{b&E4HAr+Fp-b9Xcla{+UA zPGaTe|ICHV%)qQaxtP5jO#fwH1E$w-B!g)o&fQ>oA&=|U-_VA_fsqV^^C zR;Zd?U^xk&QqM@(=>VPu3Tf1e@Y5EN$_Uoq?ewGba_R zA)k1n!tH@N-GG=AVFHjfWAZ#<39unMg{5WwaX<_)!s3$2AB3eD_e|yyk+1^!W6G`v zo^3z_Ixvi^1UeJs5)*8O#ED2-sBuFSm|{`j^|-p2cOuZtNf_o{oxD*5;#8nZWO{*R zH^>%qEQUPG#`pe%g*43C^t03rXHw* oF?{l0sCr2;X<0E~Wdd@Ip)oe~fnw5(mnY|n$+C3|0lmcl0G0g7*#H0l delta 1710 zcmeCwouFGE;LXe;!oa}6!SH6*IxjQ(_fxkpGcZ^QGBEHkFfgR#C%Yt;B7pWLg3i_=fN!d^^RV8@qXXk?48Zq!q>HaYkfE&w=%h4PQvcp)l>eyQ@1R#x#?z^ zv_oY>j$H4vnfEnr27Y^7B0I+`sMS+wI$AH@%sC zcJrEd(!W!78J+&M?!=}=E05Q2z4d%Y%rWuZR8Mwk^sV%GsmiSv-rCf59hq*f?zZ8=izxXr<@u>*f4rpkopFoH zR2DPiUH9c8ckPX-b}c%_yKbdFJg&a?TKdD=zA?Ycg17(tQcx=`Kk?p)_B$uq|K;1Q zzP?{}u5eLi(Zu4(-Jdo)XTPY^nG<<@QP}14^@k(!&&P)y+xzaH>G|Kq&AV64&$a9< z&i$A7!8AshW53B0ck$^5rZ4C-oq6qUcw5zVIW76Edo%CkUO4wv zn>_iM_0ALqpEE|bC)@&$K2w%BK525OSK~pQ&6?XU@H~B{SbolOMWh(JCHu7InW>c% zOxw8vR9`97M_*ujmVM^O@_Q#+C(a4uP)~T)GQVZ=0ZrB?6O`xrExj#s-GeDJ)#sqa zCFZP|UPlZ59az=-S$Bfovc6EJ@*b9`XO|wcO>W@!;;4~R`Ecou>DfiavnqO5dn(y} zC<+plGM&j5cdRQ$Sx>5BVbD^IiEI}z^7$!}pVIl5S-)Pwv*?ZW$Dnf}ef)dc zjH)NufAC^n=2F{y;54H{_7e8E3l6MS?laD97g*%<)-wMP{@E45d`x@q-#8NOaCCw`_Z|hsqwlrN z=ISqGsoxdx!1p-&rAn82alu%(648raE9Wj3oa<5|by0DVdqri-bT|?2QsLTym2j(g zs`;Mlu0Y@Y**9(M-!K2D_VV@nOD;0%PZ!U=p6A#1e|p8~dz(_ee$q$HWUx%nZ!>lXKYH!SpxwHDG!vM>3e^=G+aYPjc=8(`{Ue2(2s#(eprXJ14yOnY=*AP#(lXb|)9G zFhYQPlRpSaf=%KPmbOe|XJE)ltV}I3)GNqK5AbGW5@A3TX?zmTmv;cQb^$Rb!U!Pi z!{h{E39u>E!qQ6fIT#p9GILU~8sf|M-DCRX_rjt~telh23yXtwy%d&~ISe!sq{|qK z)sq!Oq!}9~+lWY5fxHt?arrKGhv;%c3^B!KNS}zb%pIr#Gi(Zg&S0D}`Jo8JD}R8> z19>6lSzuERRKO@X* - isleward + GEARED - Login diff --git a/src/client/js/components/lightPatch.js b/src/client/js/components/lightPatch.js index e3054d4c..25ab3271 100644 --- a/src/client/js/components/lightPatch.js +++ b/src/client/js/components/lightPatch.js @@ -45,7 +45,7 @@ define([ } } - var rCount = (obj.width * obj.height) / 11; + /*var rCount = (obj.width * obj.height) / 11; for (var i = 0; i < rCount; i++) { var nx = x + ~~(Math.random() * obj.width) + 2; var ny = y + ~~(Math.random() * obj.height) - (obj.height / 3); @@ -71,6 +71,34 @@ define([ sprite.pluginName = 'picture'; this.sprites.push(ray); + }*/ + + var rCount = (obj.width * obj.height) / 11; + for (var i = 0; i < rCount; i++) { + var nx = x + ~~(Math.random() * obj.width); + var ny = y + ~~(Math.random() * (obj.height)) - (obj.height / 2); + var w = 1 + ~~(Math.random() * 2); + var h = (obj.height / 4) + ~~(Math.random() * obj.height * 3); + var hm = 2; + + for (var j = 0; j < h; j++) { + var ray = renderer.buildObject({ + x: nx, + y: ny, + cell: 0, + sheetName: 'white', + layerName: 'lightBeams' + }); + ray.x = ~~((nx * scale) - (scaleMult * j)); + ray.y = (ny * scale) + (scaleMult * j * hm); + ray.alpha = ((1.0 - (j / h)) * 0.45) * (0.5 + (Math.random() * 0.5)); + ray.width = w * scaleMult; + ray.height = scaleMult * hm; + ray.tint = 0xffeb38; + ray.blendMode = PIXI.BLEND_MODES.ADD; + + this.sprites.push(ray); + } } }, diff --git a/src/server/config/maps/cave/map.json b/src/server/config/maps/cave/map.json index 0f3de24c..e8a6b0d3 100644 --- a/src/server/config/maps/cave/map.json +++ b/src/server/config/maps/cave/map.json @@ -897,7 +897,7 @@ }], "opacity":1, "type":"objectgroup", - "visible":false, + "visible":true, "x":0, "y":0 }, @@ -961,10 +961,67 @@ "width":16, "x":560, "y":1336 + }, + { + "height":56, + "id":800, + "name":"lightpatch", + "properties": + { + "cpnLightPatch":"{\"color\":\"ffff00\"}" + }, + "propertytypes": + { + "cpnLightPatch":"string" + }, + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":1040, + "y":496 + }, + { + "height":32, + "id":801, + "name":"lightpatch", + "properties": + { + "cpnLightPatch":"{\"color\":\"ffff00\"}" + }, + "propertytypes": + { + "cpnLightPatch":"string" + }, + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":1072, + "y":432 + }, + { + "height":40, + "id":802, + "name":"lightpatch", + "properties": + { + "cpnLightPatch":"{\"color\":\"ffff00\"}" + }, + "propertytypes": + { + "cpnLightPatch":"string" + }, + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":696, + "y":1136 }], "opacity":1, "type":"objectgroup", - "visible":false, + "visible":true, "x":0, "y":0 }, @@ -1566,7 +1623,7 @@ "x":0, "y":0 }], - "nextobjectid":800, + "nextobjectid":803, "orientation":"orthogonal", "properties": {