diff --git a/imports/map.js b/imports/map.js index 8f3a912..9b0d890 100644 --- a/imports/map.js +++ b/imports/map.js @@ -2,14 +2,13 @@ import { Map as MainGround } from "../system/map-player/map/mapCar import { Death as MainLava } from "../system/map-player/map/mapCarryers/DeathMap.js" import { Teleport as MainTeleport } from "../system/map-player/map/mapCarryers/Teleport.js" import { Checkpoint as MainCheckpoint } from "../system/map-player/map/mapCarryers/checkpoint.js" -import { Enabler as MainEnabler } from "../system/map-player/map/mapCarryers/Enabler.js" -import { Door as MainDoor} from "../system/map-player/map/mapCarryers/Doors.js" +import { Enabler as MainEnabler } from "../system/map-player/map/mapCarryers/Enabler.js" import { Map as ShortsGround } from "../system/map-player/map/mapCarryers/otherMaps/shorts/Map.js" import { Death as ShortsLava } from "../system/map-player/map/mapCarryers/otherMaps/shorts/DeathMap.js" import { Teleport as ShortsTeleport } from "../system/map-player/map/mapCarryers/otherMaps/shorts/Teleport.js" import { Checkpoint as ShortsCheckpoint } from "../system/map-player/map/mapCarryers/otherMaps/shorts/checkpoint.js" -import { signMaker } from "../system/map-player/map/mapCarryers/signMap.js" +import { signMaker } from "../system/map-player/map/mapCarryers/signMap.js" export class Map{ ground @@ -41,7 +40,6 @@ export class Map{ this.checkpoint = new MainCheckpoint() //-438, -509 this.enabler = new MainEnabler() this.sign = new signMaker() - this.door = new MainDoor() } diff --git a/system/map-player/map/mapCarryers/Background.js b/system/map-player/map/mapCarryers/Background.js index f799be5..95f93c2 100644 --- a/system/map-player/map/mapCarryers/Background.js +++ b/system/map-player/map/mapCarryers/Background.js @@ -486,6 +486,36 @@ export class Background { this.layer1[453] = new Hitbox(-4066,-8514,80,603 ) this.layer1[454] = new Hitbox(-4800,-8514,815,66 ) this.layer1[455] = new Hitbox(-4796,-9115,106,619 ) + this.layer1[456] = new Hitbox(4945,-10693,1472,106 ) + this.layer1[457] = new Hitbox(6318,-10886,100,298 ) + this.layer1[458] = new Hitbox(6318,-10886,2562,124 ) + this.layer1[459] = new Hitbox(8795,-10882,85,759 ) + this.layer1[460] = new Hitbox(8856,-10211,2257,87 ) + this.layer1[461] = new Hitbox(11014,-10942,101,769 ) + this.layer1[462] = new Hitbox(11014,-10942,592,100 ) + this.layer1[463] = new Hitbox(11500,-11808,106,966 ) + this.layer1[464] = new Hitbox(11500,-11808,896,104 ) + this.layer1[465] = new Hitbox(12313,-13310,83,1606 ) + this.layer1[466] = new Hitbox(11766,-13311,581,71 ) + this.layer1[467] = new Hitbox(11766,-14835,140,1594 ) + this.layer1[468] = new Hitbox(11888,-14836,1365,126 ) + this.layer1[469] = new Hitbox(13122,-15435,132,721 ) + this.layer1[470] = new Hitbox(13116,-17095,137,2381 ) + this.layer1[471] = new Hitbox(12017,-15674,87,876 ) + this.layer1[472] = new Hitbox(9114,-15674,2926,123 ) + this.layer1[473] = new Hitbox(11839,-13655,1771,96 ) + this.layer1[474] = new Hitbox(13532,-14272,96,718 ) + this.layer1[475] = new Hitbox(13613,-14272,1759,89 ) + this.layer1[476] = new Hitbox(14551,-15253,113,1027 ) + this.layer1[477] = new Hitbox(14647,-15253,534,79 ) + this.layer1[478] = new Hitbox(15087,-16228,94,1054 ) + this.layer1[479] = new Hitbox(15087,-16230,1351,81 ) + this.layer1[480] = new Hitbox(16362,-17496,75,1348 ) + this.layer1[481] = new Hitbox(13225,-15967,918,113 ) + this.layer1[482] = new Hitbox(14028,-16941,115,1087 ) + this.layer1[483] = new Hitbox(14030,-16938,2400,83 ) + this.layer1[484] = new Hitbox(13930,-15070,659,115 ) + this.layer1[485] = new Hitbox(13930,-15877,83,922 ) } diff --git a/system/map-player/map/mapCarryers/DeathMap.js b/system/map-player/map/mapCarryers/DeathMap.js index a877571..0e3d520 100644 --- a/system/map-player/map/mapCarryers/DeathMap.js +++ b/system/map-player/map/mapCarryers/DeathMap.js @@ -165,6 +165,234 @@ export class Death { this.hitboxes[this.hitboxes.length] = new Hitbox(17466,-27426,74,1487 ) this.hitboxes[this.hitboxes.length] = new Hitbox(19110,-25018,38,705 ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(24067,-25182,604,72 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24069,-27117,51,2003 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23285,-27117,835,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24657,-25182,1923,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26479,-26736,104,1608 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26226,-27002,628,473 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26717,-27560,408,1032 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25910,-27560,453,1034 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25910,-26608,1214,368 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21080,-30713,2901,85 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21333,-32756,2563,128 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23751,-33955,146,1327 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20842,-32757,679,130 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20840,-32642,130,440 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21084,-31836,92,1164 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21067,-33836,155,1136 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(19231,-33339,1915,115 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(19824,-31512,1301,149 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(19824,-31847,151,484 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(18859,-31849,1109,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22451,-31305,143,607 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21134,-31305,1461,102 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23813,-33014,1173,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24869,-32967,117,1066 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24869,-32040,851,140 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25592,-32036,126,2570 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24098,-29557,1512,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(24098,-29872,102,338 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20204,-32528,662,109 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20204,-32948,121,529 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(19425,-32948,900,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(19425,-33267,100,409 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20368,-32471,113,521 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20461,-32070,319,121 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27048,-28373,515,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27527,-28358,394,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27858,-28517,64,158 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27872,-28434,729,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28529,-28392,72,1478 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27080,-26961,1468,47 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27074,-28324,81,819 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27861,-28425,60,100 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28084,-29872,519,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28512,-30381,91,604 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28512,-30381,579,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27336,-29870,332,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27336,-30764,91,975 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27638,-30393,502,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29042,-30944,77,642 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28760,-30944,359,72 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27339,-31072,89,324 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27405,-31072,544,96 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27862,-31392,87,416 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27341,-31392,538,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29088,-30809,476,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29497,-31651,68,923 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27342,-32882,77,1512 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27399,-32882,1234,89 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28348,-32284,1236,75 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29518,-31647,287,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29744,-32289,60,715 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29482,-32289,270,79 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29354,-33105,87,864 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28531,-33105,910,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28531,-33065,102,215 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28959,-33599,81,524 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27922,-33599,1118,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27922,-33550,68,228 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27030,-33397,961,75 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27030,-33397,94,751 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27103,-32747,270,100 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29650,-32610,57,330 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29693,-32610,526,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30134,-32563,85,479 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29992,-32172,179,89 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29992,-32172,57,262 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29764,-31974,281,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29401,-33052,340,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29674,-33407,66,366 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29293,-33407,393,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29293,-33773,75,423 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28880,-33773,489,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28882,-33724,49,138 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29312,-28453,83,1522 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29312,-28453,1473,82 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29311,-26971,1049,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27949,-26940,51,1161 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29479,-26925,59,801 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28898,-26184,640,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28898,-26184,72,755 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27968,-25848,304,70 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28227,-25836,47,790 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28227,-25081,538,68 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28227,-25081,1116,69 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29313,-25701,89,690 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29885,-26306,72,1018 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29520,-26306,436,49 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29885,-26306,72,1683 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29055,-25032,81,844 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29101,-24263,1259,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29926,-25848,157,75 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30419,-25758,268,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30628,-25720,62,1312 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30285,-24468,360,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30285,-24468,77,281 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29540,-28968,125,524 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29546,-30431,121,968 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29087,-30431,579,70 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29593,-29959,579,117 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30550,-29979,502,132 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30697,-29153,100,783 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30775,-29157,683,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30942,-30555,111,689 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29538,-31078,781,104 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30240,-31552,104,579 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30327,-31552,936,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31183,-31801,81,287 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30675,-31801,534,66 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30675,-32318,67,583 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30191,-32318,551,87 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29986,-33154,79,558 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29703,-33154,362,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30215,-32749,644,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30138,-32749,87,443 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31325,-32393,528,89 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31765,-32359,89,1912 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31002,-30554,772,109 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31326,-33900,100,1536 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30490,-33900,936,109 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30494,-34316,136,481 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29429,-34316,1200,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29429,-34246,87,411 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29029,-34048,85,292 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28856,-34048,259,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28856,-34540,70,551 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28907,-34540,808,68 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29639,-34484,75,183 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31585,-30463,132,404 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31675,-30154,803,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32355,-30154,123,1408 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31423,-29155,396,92 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31723,-29085,98,820 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31630,-27808,1132,134 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32965,-29778,92,2112 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31615,-27813,1443,147 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32216,-30812,84,672 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32216,-30812,1485,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33028,-29775,840,92 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33618,-30760,83,536 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32698,-31041,60,285 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32783,-31581,59,283 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32826,-31581,739,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33504,-31811,60,287 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33504,-31811,1079,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(34494,-31751,90,2546 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33767,-29279,747,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33767,-29695,100,441 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32903,-31833,66,281 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32443,-31833,519,51 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32443,-31795,66,630 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32498,-31224,187,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32040,-31367,413,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32040,-31312,91,296 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31821,-31090,310,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31833,-31998,389,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32159,-31940,66,241 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32159,-31762,319,64 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31223,-28801,540,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31223,-28730,83,1627 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31301,-27208,706,106 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32374,-27722,128,1192 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31740,-27136,117,385 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31006,-26859,851,108 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30886,-26317,1617,104 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32375,-26560,128,347 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29891,-26025,725,55 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30568,-25993,47,257 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30272,-25986,64,100 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30311,-27236,60,328 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30360,-27236,710,53 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31004,-27195,66,387 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30662,-25398,1764,104 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32314,-26011,111,717 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32033,-26011,287,102 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32397,-25832,313,79 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32633,-26615,74,809 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32459,-26615,185,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29776,-26654,51,368 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29821,-26654,304,40 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30083,-26933,42,319 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30383,-27519,75,300 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30438,-27519,330,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30708,-27851,60,415 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30708,-27851,519,77 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29366,-27446,255,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29542,-27376,81,175 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29542,-27259,366,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29834,-27871,74,626 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29834,-27871,442,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30224,-28404,53,614 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30087,-26465,60,462 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29810,-26465,285,45 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31037,-25340,96,311 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30860,-25116,200,87 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30860,-25116,62,343 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30658,-24848,264,75 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30650,-24548,570,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31143,-24865,75,355 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31143,-24865,536,85 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31590,-24990,87,206 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31590,-24990,381,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31898,-24920,74,304 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31898,-24705,344,89 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32139,-25320,102,624 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32208,-25124,617,83 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32738,-25465,87,351 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32551,-25465,217,43 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32551,-25622,59,200 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32606,-25622,226,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32789,-25933,42,368 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32667,-25935,134,45 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32701,-27725,100,372 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32775,-27442,328,89 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32979,-27442,125,1223 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32679,-26338,325,121 ) + + } draw(cameraX, cameraY) { diff --git a/system/map-player/map/mapCarryers/Doors.js b/system/map-player/map/mapCarryers/Doors.js deleted file mode 100644 index e3b90bc..0000000 --- a/system/map-player/map/mapCarryers/Doors.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -import { Hitbox } from "../../Hitbox.js"; - -export class Door { - - // fields - hitboxes = new Array(); - - constructor() { - this.#createHitboxes(); - } - - #createHitboxes() { - //this.hitboxes[ 0 ] = new Hitbox( 0 , 0 , 0 , 0 , false ) - //this.hitboxes[this.hitboxes.length] = new Hitbox(7671, 574, 66, 415, 7671, 156 ) - //this.hitboxes[this.hitboxes.length] = new Hitbox(10194,-2578,186,189 ) - - /**/ - - } - - draw(cameraX, cameraY, color = "#505050") { - - for (let i = 0; i < this.hitboxes.length; i++) { - this.hitboxes[i].draw(cameraX, cameraY, color); - } - - } - - nDraw(camera) { - - for (let i = 0; i < this.hitboxes.length; i++) { - - this.hitboxes[i].nDraw(camera, "#203f3f"); - - } - - } -} diff --git a/system/map-player/map/mapCarryers/Map.js b/system/map-player/map/mapCarryers/Map.js index e31688e..5d163fc 100644 --- a/system/map-player/map/mapCarryers/Map.js +++ b/system/map-player/map/mapCarryers/Map.js @@ -269,9 +269,93 @@ export class Map { this.hitboxes[this.hitboxes.length] = new Hitbox(16843,-19040,3512,6090 ) this.hitboxes[this.hitboxes.length] = new Hitbox(21112,-23015,255,155 ) this.hitboxes[this.hitboxes.length] = new Hitbox(22555,-24138,308,168 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22045,-23346,255,138 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23194,-25090,183,157 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22290,-27446,279,918 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22889,-28021,442,1181 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22153,-27446,183,919 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22166,-28468,187,200 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26206,-27021,677,349 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26206,-27021,677,349 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23189,-28887,200,153 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23428,-31640,154,109 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(22387,-32142,157,111 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20948,-31911,479,177 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20950,-32253,147,517 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21086,-32253,347,102 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(20709,-32253,377,519 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27548,-28411,345,121 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27780,-28550,113,260 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27999,-29951,117,355, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27654,-29955,126,353, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27656,-30373,464,132, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28735,-30414,330,57, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28808,-30975,247,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27503,-31428,389,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28437,-32315,279,75 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(27399,-31650,119,279 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29059,-32591,253,64 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29274,-32906,253,381 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29065,-32906,462,62 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28895,-29212,187,149 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29077,-26221,170,55 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28247,-25120,245,58 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28876,-25518,119,117 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29367,-25579,259,68 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29023,-26142,228,55, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29331,-24302,328,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29175,-25058,274,79 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29930,-25063,172,64 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30053,-25830,81,366 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30053,-25913,406,257 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30374,-25913,85,445 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29852,-24685,130,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29801,-29872,200,72 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30854,-29196,370,74 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31631,-29588,113,119 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29658,-31023,198,98 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30969,-31506,164,70 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30865,-31840,153,66 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30706,-32124,81,228 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30521,-32788,168,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30026,-33112,83,292 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29327,-33554,342,55 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29327,-33848,187,349 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29508,-33848,168,57 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32314,-28866,204,136 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31691,-28344,157,117 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32911,-29636,98,596 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33570,-30307,170,109 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(33320,-30868,185,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32641,-30993,455,60 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32641,-31329,247,396 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32881,-31329,219,53 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31890,-27859,347,70 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31582,-27735,236,106 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31585,-26799,289,81 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30757,-26366,258,200 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31562,-26251,77,402 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31628,-26251,419,204 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31971,-26066,75,219 ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(23969,-30060,926,219, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23972,-30743,932,168, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23971,-31167,159,497, false, true ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(26721,-27989,406,441, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25354,-28392,1773,421, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25357,-27559,561,1320, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25356,-27605,1006,68, false, true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(26133,-27979,128,381, false, true, "D", 0,-1 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25985,-27979,104,381, false, true, "E", 0,-1 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25819,-27979,89,381, false, true, "F", 0,-1 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25665,-27979,98,381, false, true, "G", 0,-1 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25533,-27979,75,381, false, true, "H", 0,-1 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25383,-27979,91,381, false, true, "I", 0,-1 ) + this.stairs(11865,-2135,746,4, 200, 1) @@ -303,6 +387,10 @@ export class Map { this.hitboxes[this.hitboxes.length] = new Hitbox(-14874,6199,118,113 ) this.hitboxes[this.hitboxes.length] = new Hitbox(-14870,6729,115,118 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(1899,7138,1400,1816 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(6,5625,2000,2722 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(1764,5114,1550,1478 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(268,5114,3044,585 ) diff --git a/system/map-player/map/mapCarryers/Teleport.js b/system/map-player/map/mapCarryers/Teleport.js index f8d9775..3d56f98 100644 --- a/system/map-player/map/mapCarryers/Teleport.js +++ b/system/map-player/map/mapCarryers/Teleport.js @@ -19,11 +19,11 @@ export class Teleport { // 0, 0 //); - this.hitboxes[this.hitboxes.length] = new Hitbox(-16439,4729,445,146,false, 15812, -5161) - this.hitboxes[this.hitboxes.length] = new Hitbox(-16865,4757,421,104,false, 15812, -5161) this.hitboxes[this.hitboxes.length] = new Hitbox(-17439,4729,574,132,false, 15812, -5161) this.hitboxes[this.hitboxes.length] = new Hitbox(-17933,4729,494,122,false, 15812, -5161) + this.hitboxes[this.hitboxes.length] = new Hitbox(-16865,4757,421,104,false, -2607, -7134) + this.hitboxes[this.hitboxes.length] = new Hitbox(-16439,4729,445,146,false, -26327, 28442) this.hitboxes[this.hitboxes.length] = new Hitbox(-15996,4729,593,151,false, -7888, 20589) this.hitboxes[this.hitboxes.length] = new Hitbox(-15538,4875,141,490,false, 14991, -6661) @@ -31,6 +31,10 @@ export class Teleport { this.hitboxes[this.hitboxes.length] = new Hitbox(14105,-14842,270,326, false, -11143, 22107 ) this.hitboxes[this.hitboxes.length] = new Hitbox(11357,-26575,270,326, false, -11143, 22107 ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(26428,-27213,226,213, false, -2607, -7134 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(1918,6470,217,726, false, -438, -511 ) + diff --git a/system/map-player/map/mapCarryers/Triggers.js b/system/map-player/map/mapCarryers/Triggers.js index 3b873d4..173f0ce 100644 --- a/system/map-player/map/mapCarryers/Triggers.js +++ b/system/map-player/map/mapCarryers/Triggers.js @@ -25,6 +25,18 @@ export class Trigger { this.hitboxes[this.hitboxes.length] = new Hitbox(6499,-21181,473,897, true, "door", "A", true ) this.hitboxes[this.hitboxes.length] = new Hitbox(14105,-14842,270,326, true, "door", "B", true ) this.hitboxes[this.hitboxes.length] = new Hitbox(11357,-26575,270,326, false, "door", "C", true ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(21088,-32178,238,285, false, "door", "D", true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29147,-32868,151,294, false, "door", "E", true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30097,-25700,311,157, false, "door", "F", true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29449,-33820,160,285, false, "door", "G", true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32863,-31295,181,321, false, "door", "H", true ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31596,-26090,396,183, false, "door", "I", true ) + + + + this.hitboxes[this.hitboxes.length] = new Hitbox(26428,-27213,226,213, false, "door", "FINAL", true ) + diff --git a/system/map-player/map/mapCarryers/checkpoint.js b/system/map-player/map/mapCarryers/checkpoint.js index 59d5891..39d24af 100644 --- a/system/map-player/map/mapCarryers/checkpoint.js +++ b/system/map-player/map/mapCarryers/checkpoint.js @@ -31,8 +31,22 @@ export class Checkpoint { this.hitboxes[this.hitboxes.length] = new Hitbox(11029,-22340,228,338 ) this.hitboxes[this.hitboxes.length] = new Hitbox(14477,-17248,276,91 ) this.hitboxes[this.hitboxes.length] = new Hitbox(16488,-21803,219,553 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(21088,-32178,238,285 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(23211,-25159,155,94 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(25419,-28440,1558,91 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29147,-32868,151,294 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28812,-30512,159,115 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30097,-25700,311,157 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29466,-25693,111,126 ) + + this.hitboxes[this.hitboxes.length] = new Hitbox(30896,-31965,89,149 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(28935,-29364,108,166 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(29449,-33820,160,285 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31947,-27974,238,138 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(32863,-31295,181,321 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(30814,-26494,143,145 ) + this.hitboxes[this.hitboxes.length] = new Hitbox(31596,-26090,396,183 ) - /* this.hitboxes[6] = new Hitbox(7824.600652535286,-594.7523150074721,370.9999875076246,473.92704492161954 ) this.hitboxes[3] = new Hitbox(6554.600640036759,-3115.8253071301892,394.02956252528475,226.461460671424 ) diff --git a/system/map-player/map/otherParts/Keys.js b/system/map-player/map/otherParts/Keys.js index 42619d5..3fe0da9 100644 --- a/system/map-player/map/otherParts/Keys.js +++ b/system/map-player/map/otherParts/Keys.js @@ -134,6 +134,7 @@ export class Keys { this.drawImage(this.door,7030,-20273, 200, 200) this.drawImage(this.door,11888+50,-21774, 200, 200) // 11357,-26575 + this.drawImage(this.door,20865-50,-32125, 200, 200) this.drawImage(this.door,14175 - 40,-14777,200,200) this.drawImage(this.door,11357 + 40,-26575 + 70,200,200) diff --git a/system/variousParts/GameDisplayer.js b/system/variousParts/GameDisplayer.js index 30abedc..40d6516 100644 --- a/system/variousParts/GameDisplayer.js +++ b/system/variousParts/GameDisplayer.js @@ -111,7 +111,6 @@ export class GameDisplayer { } this.drawTheBeanPeople() - this.map.door.nDraw(this.camera); this.map.lava.nDraw(this.camera); this.map.checkpoint.nDraw(this.camera) this.map.enabler.nDraw(this.camera); @@ -192,8 +191,8 @@ export class GameDisplayer { this.signTextPos = ((this.signDisplayPos * 12) + 800 )/ 13 } } - this.drawUtils.Rect(0, 675 + this.signDisplayPos, 10000, 10000, "#33363f", uictx) - this.drawUtils.Rect(0, 700 + this.signDisplayPos, 10000, 10000, "#d8d8d8", uictx) + this.drawUtils.Rect(0, 675 + this.signDisplayPos, 2514, 1377 - 675, "#33363f", uictx) + this.drawUtils.Rect(0, 700 + this.signDisplayPos, 2514, 1377 - 700, "#d8d8d8", uictx) for(let j = 0; j < 6; j++){ this.drawUtils.Text(this.signText[j], 100, (800 + (100 * j)) + this.signTextPos *(j/2 + 1),"#73767f", "#33363f", uictx) } diff --git a/yoink.js b/yoink.js deleted file mode 100644 index 055546f..0000000 --- a/yoink.js +++ /dev/null @@ -1,82 +0,0 @@ -function drawCircle({ x, y, r }, color = "black", width = 1) { - ctx.strokeStyle = color; - ctx.lineWidth = width; - ctx.beginPath(); - ctx.arc(x, y, r, 0, 2*Math.PI); - ctx.stroke(); - } - - function drawLine(x1, y1, x2, y2, color = "black", width = 1) { - ctx.strokeStyle = color; - ctx.lineWidth = width; - - ctx.beginPath(); - ctx.moveTo(x1, y1); - ctx.lineTo(x2, y2); - ctx.stroke(); - } - - function drawArc(x, y, r, a1, a2, color = "black", width = 1) { - ctx.strokeStyle = color; - ctx.lineWidth = width; - - ctx.beginPath(); - ctx.arc(x, y, r, a1, a2); - ctx.stroke(); - } - - - - function render(c1, c2) { - ctx.clearRect(0, 0, cvs.width, cvs.height); - - // circles - drawCircle(c1); - drawCircle(c2); - - // tangents - const tangents = outerTangents(c1, c2); - tangents.lines.forEach( - ([[x1, y1], [x2, y2]]) => drawLine(x1, y1, x2, y2, "rgba(255, 0, 0, 0.5)", 5) - ); - - // Arcs - const [ a1, a2 ] = tangents.angles; - const from = a2 + a1; - const to = a1 - a2; - drawArc(c1.x, c1.y, c1.r, from, to, "rgba(0, 255, 255, 0.5)", 5); - drawArc(c2.x, c2.y, c2.r, to, from, "rgba(255, 0, 255, 0.5)", 5); - } - - function onChange() { - const [ x1, y1, r1, x2, y2, r2 ] = inputs.map(el => el.valueAsNumber); - render({ x: x1, y: y1, r: r1 }, { x: x2, y: y2, r: r2 }); - } - - // https://en.wikipedia.org/wiki/Tangent_lines_to_circles#Outer_tangent - function outerTangents({ x: x1, y: y1, r: r1 }, { x: x2, y: y2, r: r2 }) { - const dx = x2 - x1; - const dy = y2 - y1; - const dxy = Math.sqrt(dx ** 2 + dy ** 2); - - if (dxy <= Math.abs(r2 - r1)) { - return { lines: [], angles: [] }; - } - - const a1 = Math.atan2(dy, dx); - const a2 = Math.acos((r1 - r2) / dxy); - - return { - lines: [ - [ - [x1 + r1 * Math.cos(a1 + a2), y1 + r1 * Math.sin(a1 + a2)], - [x2 + r2 * Math.cos(a1 + a2), y2 + r2 * Math.sin(a1 + a2)] - ], - [ - [x1 + r1 * Math.cos(a1 - a2), y1 + r1 * Math.sin(a1 - a2)], - [x2 + r2 * Math.cos(a1 - a2), y2 + r2 * Math.sin(a1 - a2)] - ] - ], - angles: [ a1, a2 ] - }; - } \ No newline at end of file